详情页增加检测记录

bonus-common-biz/src/main/java/com/bonus/common/biz/domain/BmFileInfo.java

@@ -19,10 +19,18 @@ import java.util.List;
 @Data
 @ToString
 @Accessors(chain = true)
-public class BmFileInfo extends BaseEntity {
+public class BmFileInfo extends BaseEntity implements Cloneable {
 
     private static final long serialVersionUID = 1L;
-
+    @Override
+    public BmFileInfo clone() {
+        try {
+            BmFileInfo cloned = (BmFileInfo) super.clone();
+            return cloned;
+        } catch (CloneNotSupportedException e) {
+            throw new AssertionError();
+        }
+    }
     /** 主键id */
     private Long id;
 

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/MaDevQc.java

@@ -36,8 +36,8 @@ public class MaDevQc extends BaseEntity implements Serializable {
     private String deviceName;
 
     @ApiModelProperty(value = "下次检验日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date nextCheckTime;
 
     @ApiModelProperty(value = "质检编码")

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/Table.java

@@ -24,13 +24,13 @@ public class Table {
     private String checkMan;
 
     @ApiModelProperty(value = "检测日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date checkDate;
 
     @ApiModelProperty(value = "下次检测日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date nextCheckDate;
 
     @ApiModelProperty(value = "检测证明pdf")

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package com.bonus.material.device.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.convert.Convert;
 import com.bonus.common.biz.constant.MaterialConstants;
 import com.bonus.common.biz.domain.*;
 import com.bonus.common.biz.enums.MaStatusEnum;
@@ -398,10 +399,14 @@ public class DevInfoServiceImpl implements DevInfoService {
             });
             fileInfoList.addAll(devInfo.getTableList().get(i).getExaminationPdf());
 
+            List<BmFileInfo> examinationPdf = devInfo.getTableList().get(i).getExaminationPdf();
+            ArrayList<BmFileInfo> copiedList = examinationPdf.stream()
+                    .map(BmFileInfo::clone)
+                    .collect(Collectors.toCollection(ArrayList::new));
             // 新增检测证明
             MaDevQc maDevQc = new MaDevQc();
             maDevQc.setMaId(devInfo.getMaId().intValue());
-            maDevQc.setFileInfoList(devInfo.getTableList().get(i).getExaminationPdf());
+            maDevQc.setFileInfoList(copiedList);
             maDevQc.setNextCheckTime(table.getNextCheckDate());
             maDevQc.setQcUser(table.getCheckMan());
             maDevQc.setQcTime(table.getCheckDate());

bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml

@@ -13,7 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into ma_dev_qc
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="maId != null">ma_id,</if>
-            <if test="nextCheckTime != null and nextCheckTime != ''">next_check_time,</if>
+            <if test="nextCheckTime != null">next_check_time,</if>
             <if test="qcCode != null and qcCode != ''">qc_code,</if>
             <if test="qcUser != null and qcUser != ''">qc_user,</if>
             <if test="qcCom != null and qcCom != ''">qc_com,</if>