From 59710f38dee9aec7ba927e36a6b9940c509b89cc Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 22 Dec 2023 16:05:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E6=B5=81=E7=A8=8B-=E4=BA=BA=E5=91=98=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EsRevisionServiceImpl.java   | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
index 46afe313..0febb8a9 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
@@ -124,6 +124,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
         Map<String, Object> flowUser = revisionData.getFlowUser();
         ProcessEsRevision data = revisionData.getData();
         actVariables.put("mainDraftUser", flowUser.get("mainDraftUser"));
+        actVariables.put("standardizationUser", flowUser.get("standardizationUser"));
         List<OtherDraftUserVO> otherDraftUserVOS = data.getOtherDraftUserVOS();
         if (otherDraftUserVOS == null || otherDraftUserVOS.isEmpty()) {
             actVariables.put("distribute", false);
@@ -276,10 +277,12 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
         Map<String, Object> userMap = new HashMap<>();
         List<EsRevisionAdvice> advices;
         ProcessEsRevision data;
+        Map<String, Object> flowUser;
         switch (xmlNodeId) {
             case MAIN_DRAFT_USER_DISTRIBUTE:
                 // 判断是否分发 设置流程变量
                 data = revisionData.getData();
+                flowUser = revisionData.getFlowUser();
                 List<OtherDraftUserVO> otherDraftUserVOS = data.getOtherDraftUserVOS();
                 if (otherDraftUserVOS == null || otherDraftUserVOS.isEmpty()) {
                     taskService.setVariable(taskId, "distribute", false);
@@ -296,6 +299,11 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                     data.setOtherDrafterUploadFileJson(otherDraftUserVOS);
                     saveOrUpdate(data);
                 }
+                String standardizationUser = (String) flowUser.get("standardizationUser");
+                taskService.setVariable(taskId, "standardizationUser", standardizationUser);
+                // 保存人员信息
+                Map<String, Object> actVariables = this.setVariables(revisionData);
+                processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, this.getUserMap(actVariables));
                 break;
             case OTHER_DRAFT_USER_UPLOAD:
                 data = revisionData.getData();
@@ -328,6 +336,8 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                     taskService.setVariable(taskId, "raterList", raterList);
                     // 保存流程数据
                     saveOrUpdate(data);
+                    userMap.put("raterList", data.getRaters());
+                    processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, userMap);
                 }
                 break;
             case RATER_RATE:
@@ -349,11 +359,13 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                     taskService.setVariable(taskId, "contactUserList", contactUserList);
                     // 保存流程数据
                     saveOrUpdate(data);
+                    userMap.put("contactUserList", data.getContactUser());
+                    processNodeLinkService.incrementSaveNodeUserLink(processDefinitionId, processInstanceId, userMap);
                 }
                 break;
             case CONTACT_USER_DISTRIBUTE:
                 data = revisionData.getData();
-                Map<String, Object> flowUser = revisionData.getFlowUser();
+                flowUser = revisionData.getFlowUser();
                 String adviceUsers = (String) flowUser.get("adviceUserList");
                 List<String> adviceUserList = Arrays.asList(adviceUsers.split(","));
                 taskService.setVariable(taskId, "adviceUserList", adviceUserList);
@@ -370,6 +382,9 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                 adviceService.saveBatch(advices);
                 break;
             case CONTACT_USER_COLLECT:
+                data = revisionData.getData();
+                userMap.put("contactUserLeader", data.getContactUserLeader());
+                processNodeLinkService.incrementSaveNodeUserLink(processDefinitionId, processInstanceId, userMap);
             case CONTACT_USER_LEADER_APPROVAL:
                 // 保存流程数据
                 data = revisionData.getData();
@@ -399,13 +414,14 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                 String approvalUserStandard = data.getApprovalUserStandard();
                 List<String> relatedLeaderList = Arrays.asList(data.getRelatedLeader().split(","));
                 String chiefEngineer = data.getChiefEngineer();
-                userMap.put("proofreaderList", proofreaderList);
-                userMap.put("approvalUserList", approvalUserList);
-                userMap.put("approvalUserStandard", approvalUserStandard);
-                userMap.put("relatedLeaderList", relatedLeaderList);
+                userMap.put("otherDraftUserList", proofreaderList);
+                userMap.put("mainDraftUserLeaderList", approvalUserList);
+                userMap.put("standardizationUser", approvalUserStandard);
+                userMap.put("relatedDeptLeaderList", relatedLeaderList);
                 userMap.put("chiefEngineer", chiefEngineer);
                 taskService.setVariables(taskId, userMap);
                 saveOrUpdate(data);
+                processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, userMap);
                 break;
             case MAIN_DRAFT_USER_RELEASE:
                 // do nothing now TODO 在线编辑 插入签章