From a750d0c3d464107be00ca8f7e227791c09efc6bb Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Thu, 25 Jan 2024 17:52:51 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B):=2080237?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...cessFbStandardConsultationServiceImpl.java | 42 ++++++++++++++++++-
 1 file changed, 40 insertions(+), 2 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 7c5a8a70..8aa705be 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
@@ -263,6 +263,11 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
         // 完成任务
         taskService.complete(taskId);
 
+        // 判断法规工程师审批节点是否经过转办
+        if (pass && taskDefinitionKey.equals(ConsultationTaskKey.DEPART_LEADER_END_4)) {
+            isTransition(processInfoVO);
+        }
+
         // 如果流程已经结束
         endProcess(processInstanceId, businessId);
     }
@@ -609,7 +614,7 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
             case ConsultationTaskKey.DEPART_LEADER_COLLECT_3: // 法规工程师审批驳回后的子流程中的各部所主管级领导汇总
             case ConsultationTaskKey.DEPART_LEADER_COLLECT_2: // 各部所主管级领导汇总（不分发给模块负责人）
                 log.info("{} 汇总", realName);
-                collect(processInfoVO);
+                collect(processInfoVO, taskDefinitionKey);
                 break;
             case ConsultationTaskKey.MODULE_OWNER_START: // 模块负责人分发
                 log.info("模块负责人 {} 分发", realName);
@@ -795,7 +800,7 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
      * @Date: 2023/11/21 9:39
      * @Description: 汇总
      **/
-    private void collect(ProcessInfoVO<ProcessFbStandardConsultationVO> processInfoVO) {
+    private void collect(ProcessInfoVO<ProcessFbStandardConsultationVO> processInfoVO, String taskDefinitionKey) {
         ProcessFbStandardConsultationVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); // 全部业务信息
         List<ProcessFbConsultationList> processFbConsultationLists = businessInfoDTO.getProcessFbConsultationLists();
 
@@ -809,6 +814,39 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
         runtimeService.setVariableLocal(task.getProcessInstanceId(), FbCommon.VARIABLE_PASS_SECOND, true);
         // 完成任务
         taskService.complete(taskId);
+
+        // 判断法规工程师审批节点是否经过转办
+        if (ConsultationTaskKey.DEPART_LEADER_COLLECT_3.equals(taskDefinitionKey)){
+            isTransition(processInfoVO);
+        }
+    }
+
+    private void isTransition(ProcessInfoVO<ProcessFbStandardConsultationVO> processInfoVO) {
+        // 判断法规工程师审批节点是否经过转办
+        List<ProcessApprovalRecord> processApprovalRecordList = processApprovalRecordService.list(
+                new LambdaQueryWrapper<ProcessApprovalRecord>()
+                        .eq(ProcessApprovalRecord::getProcessInstanceId, processInfoVO.getBasicProcessInfoDTO().getProcessInstanceId())
+                        .orderByDesc(ProcessApprovalRecord::getCreateTime));
+        if (!processApprovalRecordList.isEmpty()){
+            ProcessApprovalRecord processApprovalRecord = processApprovalRecordList.get(0);
+            processApprovalRecordList.remove(0);
+            Optional<ProcessApprovalRecord> optional = processApprovalRecordList.stream().filter(v ->
+                    v.getTaskName().equals(processApprovalRecord.getTaskName())
+                            && v.getNodeId().equals(processApprovalRecord.getNodeId())).findFirst();
+            optional.ifPresent(v -> {
+                // 是否转办过
+                if (StringUtils.isNotBlank(v.getTransferBy())){
+                    // 转办给转办人
+                    taskService.setAssignee(processApprovalRecord.getTaskId(), v.getUserId());
+                    // 更新流程审批记录表
+                    processApprovalRecordService.update(
+                            new LambdaUpdateWrapper<ProcessApprovalRecord>()
+                                    .eq(ProcessApprovalRecord::getTaskId, processApprovalRecord.getTaskId())
+                                    .set(ProcessApprovalRecord::getUserId, v.getUserId())
+                                    .set(ProcessApprovalRecord::getOriginUserId, v.getUserId()));
+                }
+            });
+        }
     }
 
     /**