From d5986d572af69f09a2234a2b2a5cdc47281f1bd4 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Fri, 20 Dec 2024 17:15:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/common/biz/domain/BmFileInfo.java | 12 ++++++++++-- .../com/bonus/material/device/domain/MaDevQc.java | 4 ++-- .../java/com/bonus/material/device/domain/Table.java | 8 ++++---- .../device/service/impl/DevInfoServiceImpl.java | 7 ++++++- .../mapper/material/device/MaDevQcMapper.xml | 2 +- 5 files changed, 23 insertions(+), 10 deletions(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/BmFileInfo.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/BmFileInfo.java index 8e2e6c4..0d1bff6 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/BmFileInfo.java +++ b/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; diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/MaDevQc.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/MaDevQc.java index 7e25834..8728279 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/MaDevQc.java +++ b/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") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date nextCheckTime; @ApiModelProperty(value = "质检编码") diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/Table.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/Table.java index 622f04a..7310dc7 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/Table.java +++ b/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") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date checkDate; @ApiModelProperty(value = "下次检测日期") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date nextCheckDate; @ApiModelProperty(value = "检测证明pdf") diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java index 4600b14..9d774fb 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java +++ b/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 examinationPdf = devInfo.getTableList().get(i).getExaminationPdf(); + ArrayList 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()); diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml index 282142c..beb972f 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml +++ b/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 ma_id, - next_check_time, + next_check_time, qc_code, qc_user, qc_com,