From 73760caeebd66a14c9c1fb792664ef2ea632f7a6 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 12 Aug 2024 10:30:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2087915=20=E6=B3=95=E8=A7=84=E7=AC=A6?=
 =?UTF-8?q?=E5=90=88=E6=80=A7=E6=8E=92=E6=9F=A5=E6=B5=81=E7=A8=8B=EF=BC=88?=
 =?UTF-8?q?=E4=B8=BB=E6=8E=92=E6=9F=A5=E4=BA=BA=E5=88=86=E6=89=B9=E4=B8=8B?=
 =?UTF-8?q?=E5=8F=91=EF=BC=89=20--=E4=B8=8D=E5=88=86=E5=8F=91--=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E7=9A=84=E6=9D=A1=E6=AC=BE=E5=86=85=E5=AE=B9=E6=9C=89?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/WithoutDistributeExcelTemplate.java    | 16 ++++++++++++++++
 ...essStandardComplianceCheckServiceImpl.java | 19 +++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/WithoutDistributeExcelTemplate.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/WithoutDistributeExcelTemplate.java
index 810a0aa5..e02f4a2f 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/WithoutDistributeExcelTemplate.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/vo/WithoutDistributeExcelTemplate.java
@@ -8,8 +8,24 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 @Data
 public class WithoutDistributeExcelTemplate {
 
+    /**
+     * 条款号
+     */
+    @ApiModelProperty(value = "id")
     private String id;
 
+    /**
+     * 流程实例Id
+     */
+    @ApiModelProperty(value = "流程实例Id")
+    private String processInstanceId;
+
+    /**
+     * 主表Id
+     */
+    @ApiModelProperty(value = "主表Id")
+    private String checkId;
+
     /**
      * 条款号
      */
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
index b78c7bc8..e4da0a30 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
@@ -213,6 +213,23 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
         sccDetailService.remove(updateWrapper);
         // 子表设置流程实例Id
         detailInfoList.parallelStream().forEach(detail -> {
+            detail.setId(null);
+            detail.setResult(null);
+            detail.setCorrectionSolution(null);
+            detail.setCorrectionCost(null);
+            detail.setCorrectionPeriod(null);
+            detail.setDescription(null);
+            detail.setCommonality(null);
+            detail.setCommonalityCost(null);
+            detail.setDescription(null);
+            detail.setUnsatisfiedRequire(null);
+            detail.setValuationTime(null);
+            detail.setAuthDept(null);
+            detail.setIsSameAsPrevVersion(null);
+            detail.setMaterial(null);
+            detail.setRemark(null);
+            detail.setMainCheckUser(null);
+            detail.setDesignEngineer(null);
             detail.setCheckId(checkId);
             detail.setProcessInstanceId(processInstanceId);
         });
@@ -736,6 +753,8 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
         for (int i = 0; i < list.size(); i++) {
             WithoutDistributeExcelTemplate item = list.get(i);
             item.setId(existDataList.get(i).getId());
+            item.setProcessInstanceId(existDataList.get(i).getProcessInstanceId());
+            item.setCheckId(existDataList.get(i).getCheckId());
             String result = item.getResult();
             if (StrUtil.isBlank(result)) {
                 item.setUnsatisfiedRequire(null);