From f08c479a85bc8c808a09ffa79d31ab351b95e93c Mon Sep 17 00:00:00 2001
From: liao <liao@syxysoft.com>
Date: Tue, 28 Nov 2023 20:25:34 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...cessFbStandardConsultationServiceImpl.java | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java
index 2ab13e52..9c5fb91d 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java
@@ -3,6 +3,7 @@ package com.jero.modules.activiti.process.fb.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.common.api.vo.ResultCommon;
 import com.jero.common.util.UUIDUtils;
+import com.jero.modules.activiti.entity.ProcessApprovalRecord;
 import com.jero.modules.activiti.entity.ProcessNode;
 import com.jero.modules.activiti.entity.ProcessNodeLink;
 import com.jero.modules.activiti.enums.CommitFlagEnum;
@@ -23,6 +24,7 @@ import com.jero.modules.activiti.process.fb.service.IProcessFbStandardConsultati
 import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
 import com.jero.modules.activiti.process.fb.vo.ProcessFbStandardConsultationVO;
 import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
+import com.jero.modules.activiti.service.ProcessApprovalRecordService;
 import com.jero.modules.activiti.service.ProcessNodeLinkService;
 import com.jero.modules.activiti.service.ProcessNodeService;
 import com.jero.modules.laws.common.util.CurrentUserUtil;
@@ -72,6 +74,8 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
     private ProcessNodeLinkService processNodeLinkService;
     @Resource
     private ISysUserService sysUserService;
+    @Resource
+    private ProcessApprovalRecordService processApprovalRecordService;
     
     public static final String EXCEPTION = "目前还未开发，请联系管理员";
 
@@ -192,7 +196,6 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
                     // 法规工程师驳回 任务列表
                     List<Task> chooseTaskList = taskService.createTaskQuery()
                             .processInstanceId(processInstanceId)
-                            .processDefinitionKey(ConsultationTaskKey.REJECT)
                             .list();
 
                     // 自动完成任务选择
@@ -214,6 +217,12 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
                         }
                         // 完成驳回任务
                         taskService.complete(chooseTaskId);
+
+                        // 删除驳回的审批记录
+                        LambdaQueryWrapper<ProcessApprovalRecord> removeWrapper = new LambdaQueryWrapper<>();
+                        removeWrapper.eq(ProcessApprovalRecord::getTaskId, chooseTaskId);
+                        removeWrapper.eq(ProcessApprovalRecord::getProcessInstanceId, processInstanceId);
+                        processApprovalRecordService.remove(removeWrapper);
                     }
                     return;
                 case ConsultationTaskKey.DEPART_LEADER_END_4:
@@ -561,22 +570,13 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
             log.info("流程 {} 已经结束", processInstanceId);
         } else {
             List<Task> taskList = taskService.createTaskQuery().processInstanceId(processInstanceId).list();
-            List<Execution> executionList = runtimeService.createExecutionQuery().processInstanceId(processInstanceId).list();
             log.info("还剩 {} 个任务待完成", taskList.size());
             taskList.forEach(lastTask -> {
                 log.info("=======================================================================");
                 log.info("任务id: {}", lastTask.getId());
                 log.info("任务name: {}", lastTask.getName());
-                log.info("任务executionId: {}", lastTask.getExecutionId());
-                log.info("=======================================================================");
-            });
-            log.info("还剩 {} 个执行实例待完成", executionList.size());
-            executionList.forEach(lastExecution -> {
-                log.info("=======================================================================");
-                log.info("执行实例id: {}", lastExecution.getId());
-                log.info("执行实例parentId: {}", lastExecution.getParentId());
-                log.info("执行实例name: {}", lastExecution.getName());
-                log.info("执行实例activityId: {}", lastExecution.getActivityId());
+                SysUser user = sysUserService.getById(lastTask.getAssignee());
+                log.info("处理人: {}", user.getUsername() + "(" + user.getRealname() + ")");
                 log.info("=======================================================================");
             });
         }
@@ -657,8 +657,11 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
             userLinkList.add(userLink);
         });
 
-        processFbConsultationUserLinkService.removeById(userLinkId); // 先删除
-        processFbConsultationUserLinkService.saveBatch(userLinkList, userLinkList.size()); // 后新增
+        int size = userLinkList.size();
+        if (size > 0) {
+            processFbConsultationUserLinkService.removeById(userLinkId); // 先删除
+            processFbConsultationUserLinkService.saveBatch(userLinkList, size); // 后新增
+        }
     }