From b78e0db544229ce90c74877f622e337fb92c1f79 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 17 Jul 2024 16:31:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20scc=E6=B5=81=E7=A8=8B=E5=88=86=E5=8F=91?=
 =?UTF-8?q?=E7=BB=99=E5=A4=9A=E4=B8=AA=E4=BA=BA=E5=85=B6=E4=B8=AD=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=A2=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessStandardComplianceCheckServiceImpl.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 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 1eb7036b..bea4b215 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
@@ -320,8 +320,8 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
                         detail.setAssessor(curUserId);
                         detail.setAuthDept(curUserDepartIds);
                     });
+                    sccDetailService.updateBatchById(detailInfoList);
                 }
-                sccDetailService.updateBatchById(detailInfoList);
                 runtimeService.setVariable(processInstanceId, DISTRIBUTE, distributeFlag);
                 runtimeService.setVariable(processInstanceId, UNALLOCATED_QUANTITY, unallocatedQuantity);
                 break;
@@ -436,8 +436,6 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
         String taskDefinitionKey = delegateTask.getTaskDefinitionKey();
         String processInstanceId = delegateTask.getProcessInstanceId();
         Map<String, Object> userInfoMap = new HashMap<>();
-        ProcessInfoVO<ProcessDemoVO> processInfoVO = new ProcessInfoVO<>();
-        BasicProcessInfoDTO basicProcessInfoDTO = new BasicProcessInfoDTO();
         String mainInstanceId = (String) delegateTask.getVariable(ActivitiCommon.MAIN_INSTANCE_ID);
         //保存父子关联信息
         Map<String, Object> variables = new HashMap<>();
@@ -455,6 +453,8 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
             case AUTO_TASK_3:
                 List<String> designerList = (List<String>) delegateTask.getVariable(DESIGNER_LIST);
                 for (String designer : designerList) {
+                    ProcessInfoVO<ProcessDemoVO> processInfoVO = new ProcessInfoVO<>();
+                    BasicProcessInfoDTO basicProcessInfoDTO = new BasicProcessInfoDTO();
                     userInfoMap.put(DESIGNER, designer);
                     userInfoMap.put(MAIN_CHECK_USER, mainCheckUser);
                     // 流程定义id
@@ -462,7 +462,6 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
                     basicProcessInfoDTO.setProcessDefinitionId(definitionId);
                     basicProcessInfoDTO.setProcessType(ProcessTypeEnum.STANDARD_COMPLIANCE_CHECK.getValue()); // 流程类型
                     processInfoVO.setBasicProcessInfoDTO(basicProcessInfoDTO);
-
                     processInfoVO.setProcessVariables(variables);
                     processInfoVO.setUserInfoMap(userInfoMap);
                     String childPrcId = processHandleService.startChildrenProcess(processInfoVO);
@@ -470,20 +469,21 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
                     wrapper.eq(ProcessStandardComplianceCheckDetail::getCheckId, checkId);
                     wrapper.eq(ProcessStandardComplianceCheckDetail::getDesignEngineer, designer);
                     wrapper.eq(ProcessStandardComplianceCheckDetail::getBatchId, batchId);
-                    wrapper.set(ProcessStandardComplianceCheckDetail::getDesignEngineer, designer);
                     wrapper.set(ProcessStandardComplianceCheckDetail::getProcessInstanceId, childPrcId);
                     sccDetailService.update(wrapper);
+                    wrapper.clear();
                 }
                 break;
             //设计工程师驳回后自动任务
             case AUTO_TASK_2:
+                ProcessInfoVO<ProcessDemoVO> processInfoVO = new ProcessInfoVO<>();
+                BasicProcessInfoDTO basicProcessInfoDTO = new BasicProcessInfoDTO();
                 userInfoMap.put(MAIN_CHECK_USER, mainCheckUser);
                 // 流程定义id
                 String definitionId = processHandleService.getDefinitionIdByKey(ProcessDefinitionKey.STANDARD_COMPLIANCE_CHECK_REDISTRIBUTE);
                 basicProcessInfoDTO.setProcessDefinitionId(definitionId);
                 basicProcessInfoDTO.setProcessType(ProcessTypeEnum.STANDARD_COMPLIANCE_CHECK.getValue()); // 流程类型
                 processInfoVO.setBasicProcessInfoDTO(basicProcessInfoDTO);
-
                 processInfoVO.setProcessVariables(variables);
                 processInfoVO.setUserInfoMap(userInfoMap);
                 String childPrcId = processHandleService.startChildrenProcess(processInfoVO);
@@ -494,8 +494,8 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
                 wrapper.set(ProcessStandardComplianceCheckDetail::getDesignEngineer, null);
                 wrapper.set(ProcessStandardComplianceCheckDetail::getProcessInstanceId, childPrcId);
                 sccDetailService.update(wrapper);
+                wrapper.clear();
                 break;
-            default:
         }
     }