From 622077a7a075714cc91e2d0f70c3284f16b11a4f Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 16 Jul 2024 11:56:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20scc=E6=B5=81=E7=A8=8B=E5=88=86=E6=89=B9?=
 =?UTF-8?q?=E5=88=86=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ProcessStandardComplianceCheckConstants.java |  2 ++
 .../ProcessStandardComplianceCheckDetail.java   |  6 ++++++
 ...ocessStandardComplianceCheckServiceImpl.java | 17 +++++++----------
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/common/ProcessStandardComplianceCheckConstants.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/common/ProcessStandardComplianceCheckConstants.java
index 3e137df1..7ff9e5e6 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/common/ProcessStandardComplianceCheckConstants.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/common/ProcessStandardComplianceCheckConstants.java
@@ -26,6 +26,8 @@ public class ProcessStandardComplianceCheckConstants {
     public static final String UNALLOCATED_QUANTITY  = "unallocatedQuantity";
     /** 主表Id */
     public static final String CHECK_ID  = "checkId";
+    /** 分发批次唯一Id */
+    public static final String BATCH_ID  = "batchId";
 
     /**
      * 法规工程师发起
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java
index 32b0b540..72848679 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java
@@ -186,6 +186,12 @@ public class ProcessStandardComplianceCheckDetail implements Serializable {
     @ApiModelProperty(value = "主表Id")
     private String checkId;
 
+    /**
+     * 分发批次唯一Id
+     */
+    @ApiModelProperty(value = "分发批次唯一Id")
+    private String batchId;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file
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 2a56b087..c83332ac 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
@@ -41,7 +41,6 @@ import org.activiti.engine.TaskService;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
-import org.apache.commons.beanutils.BeanUtils;
 import org.apache.http.entity.ContentType;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.entity.ImportParams;
@@ -52,7 +51,6 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -278,6 +276,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
                 boolean distributeFlag = businessInfoDTO.getStandardInfo().getDistributeFlag().equals(YesOrNoEnum.YES.getValue());
                 int unallocatedQuantity = 0;
                 if (distributeFlag) {
+                    String batchId = UUID.randomUUID().toString();
                     // 筛选出本次提交分发出的数据
                     List<ProcessStandardComplianceCheckDetail> distributeDetailList = detailInfoList.stream()
                             .filter(e -> StrUtil.isNotBlank(e.getDesignEngineer()))
@@ -296,14 +295,10 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
                     distributeDetailList.forEach(detail -> {
                         String[] engineers = detail.getDesignEngineer().split(",");
                         for (String engineer : engineers) {
-                            ProcessStandardComplianceCheckDetail newDetail = new ProcessStandardComplianceCheckDetail();
-                            try {
-                                BeanUtils.copyProperties(detail, newDetail);
-                            } catch (IllegalAccessException | InvocationTargetException e) {
-                                log.error("BeanUtils.copyProperties error", e);
-                                throw new JeroBootException(e);
-                            }
+                            ProcessStandardComplianceCheckDetail newDetail = BeanCopyUtils.
+                                    copyBean(detail, ProcessStandardComplianceCheckDetail.class);
                             newDetail.setDesignEngineer(engineer);
+                            newDetail.setBatchId(batchId);
                             needAddDetailInfoList.add(newDetail);
                         }
                     });
@@ -311,6 +306,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
                     sccDetailService.removeByIds(ids);
                     sccDetailService.saveBatch(needAddDetailInfoList);
                     runtimeService.setVariable(processInstanceId, DESIGNER_LIST, designEngineerList);
+                    runtimeService.setVariable(processInstanceId, BATCH_ID, batchId);
                     userMap.put(DESIGNER_LIST, String.join(",", designEngineerList));
                     processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, userMap);
                 } else {
@@ -448,6 +444,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
             case AUTO_TASK_3:
                 List<String> designerList = (List<String>) delegateTask.getVariable(DESIGNER_LIST);
                 String checkId = (String) delegateTask.getVariable(CHECK_ID);
+                String batchId = (String) delegateTask.getVariable(BATCH_ID);
                 for (String designer : designerList) {
                     userInfoMap.put(DESIGNER, designer);
                     userInfoMap.put(MAIN_CHECK_USER, mainCheckUser);
@@ -463,7 +460,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
                     // 更新子表数据，将数据绑定给子流程
                     wrapper.eq(ProcessStandardComplianceCheckDetail::getCheckId, checkId);
                     wrapper.eq(ProcessStandardComplianceCheckDetail::getDesignEngineer, designer);
-                    wrapper.isNull(ProcessStandardComplianceCheckDetail::getDesignEngineer);
+                    wrapper.eq(ProcessStandardComplianceCheckDetail::getBatchId, batchId);
                     wrapper.set(ProcessStandardComplianceCheckDetail::getDesignEngineer, designer);
                     wrapper.set(ProcessStandardComplianceCheckDetail::getProcessInstanceId, childPrcId);
                     sccDetailService.update(wrapper);