From dac4d86ea6689a00a3bd8065832340510132bcfa Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 18 Jul 2024 13:34:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20scc=E6=B5=81=E7=A8=8B=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3=E6=94=B9=E4=B8=BA=E5=85=88?=
 =?UTF-8?q?=E5=88=A0=E5=90=8E=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessStandardComplianceCheckServiceImpl.java | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

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 fcbe1072..485b0b25 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
@@ -258,6 +258,8 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
         ProcessSccVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
         ProcessStandardComplianceCheck standardInfo = businessInfoDTO.getStandardInfo();
         List<ProcessStandardComplianceCheckDetail> detailInfoList = businessInfoDTO.getDetailInfoList();
+        List<String> detailInfoListIds = detailInfoList.stream()
+                .map(ProcessStandardComplianceCheckDetail::getId).collect(Collectors.toList());
         // 根据流程实例Id获取流程定义ID
         ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
         // 获取流程实例ID
@@ -336,7 +338,9 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
                         detail.setAssessor(curUserId);
                         detail.setAuthDept(curUserDepartIds);
                     });
-                    sccDetailService.updateBatchById(detailInfoList);
+                    // 先删后增
+                    removeByIds(detailInfoListIds);
+                    sccDetailService.saveBatch(detailInfoList);
                 }
                 runtimeService.setVariable(processInstanceId, DISTRIBUTE, distributeFlag);
                 runtimeService.setVariable(processInstanceId, UNALLOCATED_QUANTITY, unallocatedQuantity);
@@ -348,11 +352,15 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
                     detail.setAssessor(curUserId);
                     detail.setAuthDept(curUserDepartIds);
                 });
-                sccDetailService.updateBatchById(detailInfoList);
+                // 先删后增
+                removeByIds(detailInfoListIds);
+                sccDetailService.saveBatch(detailInfoList);
                 runtimeService.setVariable(processInstanceId, DESIGNER, curUserId);
                 break;
             case MAIN_CHECK_USER_COLLECT:
-                sccDetailService.updateBatchById(detailInfoList);
+                // 先删后增
+                removeByIds(detailInfoListIds);
+                sccDetailService.saveBatch(detailInfoList);
                 // 不分发直接设置后续审批节点的人员变量
                 List<String> counterSignUserList = Arrays.asList(standardInfo.getCountersignUser().split(","));
                 List<String> managerList = Arrays.asList(standardInfo.getManager().split(","));