From 0aae51651f756b29f2a2f64e3e412a30a42f1a68 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 15 Dec 2023 14:00:03 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=BB=E5=8A=A8=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BA=BA=E5=91=98=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessEsAnnualReportServiceImpl.java       | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
index e481c8ca..eb3461d4 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
@@ -155,12 +155,16 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
         String taskName = task.getName();
         String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
+        // 获取流程实例
+        ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+        String processDefinitionId = processInstance.getProcessDefinitionId();
         ProcessEsAnnualReport annualReport;
         String executionId = task.getExecutionId();
         String contactUser = (String) runtimeService.getVariable(executionId, "contactUser");
         String workGroupUser = (String) runtimeService.getVariable(executionId, "workGroupUser");
         String contactUserLeaderLeader;
         LambdaQueryWrapper<ProcessEsAnnualReport> wrapper = new LambdaQueryWrapper<>();
+        Map<String, Object> userVariable = new HashMap<>();
         switch (taskName) {
             case CONTACT_USER_DISTRIBUTE:
                 annualReport = annualReportDataVO.getDataList().get(0);
@@ -176,6 +180,8 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
                     taskService.setVariable(taskId, "workGroupUserList", workGroupUserList);
                     // 将联络人主管级上一级领导保存到流程变量中
                     taskService.setVariable(taskId, contactUser + "-ContactUserLeaderLeader", contactUserLeaderLeader);
+                    userVariable.put("workGroupUserList", workGroupUsers);
+                    userVariable.put("contactUser", contactUser);
                 } else {
                     // 保存联络人主管级上级领导
                     dataList.forEach(data -> data.setContactUserLeaderLeader(contactUserLeaderLeader));
@@ -186,6 +192,8 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
                     saveBatch(dataList);
                     taskService.setVariable(taskId, "contactUserLeaderLeader", contactUserLeaderLeader);
                 }
+                userVariable.put("contactUserLeaderLeader", contactUserLeaderLeader);
+                processNodeLinkService.incrementSaveNodeUserLink(processDefinitionId, processInstanceId, userVariable);
                 break;
             case WORK_GROUP_COLLECT:
                 // 先删后增
@@ -206,6 +214,8 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
                 saveBatch(dataList);
                 // 设置下一个节点的审批人流程变量
                 taskService.setVariable(taskId, "collectUserLeader", collectUserLeader);
+                userVariable.put("collectUserLeader", collectUserLeader);
+                processNodeLinkService.incrementSaveNodeUserLink(processDefinitionId, processInstanceId, userVariable);
                 break;
             case CONTACT_USER_COLLECT:
                 // 先删后增
@@ -218,6 +228,8 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
                 dataList.forEach(data -> data.setProcessInstanceId(processInstanceId));
                 dataList.forEach(data -> data.setContactUserLeaderLeader(contactUserLeaderLeader));
                 taskService.setVariable(taskId, "contactUserLeaderLeader", contactUserLeaderLeader);
+                userVariable.put("contactUserLeaderLeader", contactUserLeaderLeader);
+                processNodeLinkService.incrementSaveNodeUserLink(processDefinitionId, processInstanceId, userVariable);
                 saveBatch(dataList);
                 break;
         }