From 87a3956718767eb62e82817465ce5a4812740334 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 17 Jul 2024 19:22:15 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B1=87=E6=80=BB=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=B5=81=E7=A8=8B=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../listener/ProcessSCCEndListener.java              |  4 +++-
 .../ProcessStandardComplianceCheckServiceImpl.java   | 12 ++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/listener/ProcessSCCEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/listener/ProcessSCCEndListener.java
index 9e54de20..2f48773f 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/listener/ProcessSCCEndListener.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/listener/ProcessSCCEndListener.java
@@ -15,6 +15,8 @@ public class ProcessSCCEndListener implements ExecutionListener {
 
     @Override
     public void notify(DelegateExecution delegateExecution) {
-        log.info("流程结束");
+        log.info("法规符合性排查流程结束监听器开始执行");
+
+        log.info("法规符合性排查流程结束监听器结束执行");
     }
 }
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 b1dcd914..d341e1c0 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
@@ -355,6 +355,18 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
                 break;
             case MAIN_CHECK_USER_COLLECT:
                 sccDetailService.updateBatchById(detailInfoList);
+                // 不分发直接设置后续审批节点的人员变量
+                List<String> counterSignUserList = Arrays.asList(standardInfo.getCountersignUser().split(","));
+                List<String> managerList = Arrays.asList(standardInfo.getManager().split(","));
+                List<String> seniorMangagerList = Arrays.asList(standardInfo.getSeniorManager().split(","));
+                runtimeService.setVariable(processInstanceId, COUNTERSIGN_USER_LIST, counterSignUserList);
+                runtimeService.setVariable(processInstanceId, MANAGER_LIST, managerList);
+                runtimeService.setVariable(processInstanceId, SENIOR_MANAGER_LIST, seniorMangagerList);
+                // 保存选人信息
+                userMap.put(COUNTERSIGN_USER_LIST, standardInfo.getCountersignUser());
+                userMap.put(MANAGER_LIST, standardInfo.getManager());
+                userMap.put(SENIOR_MANAGER_LIST, standardInfo.getSeniorManager());
+                processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, userMap);
                 break;
         }
         runtimeService.setVariable(processInstanceId, PASS, true);