From f2ff1c3d1f1fbd72b36b6c53fc3a7e80d77b9870 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 4 Jul 2024 09:23:51 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=AF=B9=E6=8E=A5=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E7=94=9F=E6=88=90=E5=8A=9E=E7=BB=93=20?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81=E8=8A=82=E7=82=B9=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../listener/MyGlobalEventListener.java       | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java
index 2809a1e5..9af9e051 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java
@@ -201,8 +201,6 @@ public class MyGlobalEventListener implements ActivitiEventListener {
             list.add(hiworkTodoAdd);
             pushWorkflowIntegrationAPI.sendTodoTask(list);
 
-            //    对接统一平台生成办结
-            pushWorkflowIntegrationAPI.sendActivityComplete(list);
             //更新转办任务id
             LambdaUpdateWrapper<ProcessApprovalRecord> update = new LambdaUpdateWrapper<>();
             update.eq(ProcessApprovalRecord::getTaskId,taskId);
@@ -298,9 +296,6 @@ public class MyGlobalEventListener implements ActivitiEventListener {
         hiworkTodoAdd.setProcessDefinitionId(processDefinitionId);
         list.add(hiworkTodoAdd);
         pushWorkflowIntegrationAPI.sendTodoTask(list);
-
-        //    对接统一平台生成办结
-        pushWorkflowIntegrationAPI.sendActivityComplete(list);
     }
 
     private void entityDeleted(ActivitiEvent event) {
@@ -356,6 +351,7 @@ public class MyGlobalEventListener implements ActivitiEventListener {
         ProcessAllService processAllService = SpringContextUtil.getBean(ProcessAllService.class);
 
         String processInstanceId = execution.getProcessInstanceId();
+        String processDefinitionId = execution.getProcessDefinitionId();
         ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId);
         Date createTime = processAll.getCreateTime();
         DateTime date = DateUtil.date();
@@ -373,6 +369,22 @@ public class MyGlobalEventListener implements ActivitiEventListener {
         log.info("taskEntity.getActivityName() = " + execution.getActivityName());
         log.info("taskEntity.getDeploymentId() = " + execution.getDeploymentId());
         log.info("taskEntity.getProcessDefinitionId() = " + execution.getProcessDefinitionId());
+        //    对接统一平台生成办结
+        //更新审批信息为完成
+        ProcessApprovalRecordService recordService = SpringContextUtil.getBean(ProcessApprovalRecordService.class);
+        LambdaQueryWrapper<ProcessApprovalRecord> wrapper1 = new LambdaQueryWrapper<>();
+        wrapper1.eq(ProcessApprovalRecord::getProcessInstanceId,processInstanceId);
+        List<ProcessApprovalRecord> approvalRecordList = recordService.list(wrapper1);
+        // 对接统一平台生成办结任务
+        PushWorkflowIntegrationAPI pushWorkflowIntegrationAPI = SpringContextUtil.getBean(PushWorkflowIntegrationAPI.class);
+        List<HiworkTodoAdd> list = new ArrayList<>();
+        for (ProcessApprovalRecord approvalRecord : approvalRecordList) {
+            HiworkTodoAdd hiworkTodoAdd = new HiworkTodoAdd();
+            hiworkTodoAdd.setRecordId(approvalRecord.getId());
+            hiworkTodoAdd.setProcessDefinitionId(processDefinitionId);
+            list.add(hiworkTodoAdd);
+        }
+        pushWorkflowIntegrationAPI.sendActivityComplete(list);
     }
 
     private boolean isFirstNodeTask(ProcessApprovalRecord record) {