From 75b334fa3267e47fb43aca1136c05db49cf4c341 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 28 Dec 2023 17:54:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=B6=E4=BF=AE=E8=AE=A2=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E7=BB=93=E6=9D=9F=20=E9=A9=B3=E5=9B=9E=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E4=B8=8D=E6=B6=88=E5=A4=B1BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/service/ActFlowCommonService.java      | 15 +++++++++++++++
 .../service/impl/EsRevisionServiceImpl.java       | 10 +++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
index 05773a4f..ae12058c 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
@@ -444,6 +444,21 @@ public class ActFlowCommonService {
         updateWrapper.eq(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.INCOMPLETE.getValue());
         updateWrapper.eq(ProcessApprovalRecord::getTaskName, nodeName);
         updateWrapper.set(ProcessApprovalRecord::getCommitFlag, CommitFlagEnum.UNDISPOSED.getValue());
+        updateWrapper.set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue());
+        processApprovalRecordService.update(updateWrapper);
+    }
+
+    /**
+     * 会签节点驳回后，将其余节点recode设置为 未处理 状态
+     * @param prcId
+     * @param nodeName
+     */
+    public void cleanOtherCountersignTask(String prcId, String nodeName) {
+        LambdaUpdateWrapper<ProcessApprovalRecord> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(ProcessApprovalRecord::getProcessInstanceId, prcId);
+        updateWrapper.eq(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.INCOMPLETE.getValue());
+        updateWrapper.eq(ProcessApprovalRecord::getTaskName, nodeName);
+        updateWrapper.set(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue());
         processApprovalRecordService.update(updateWrapper);
     }
 
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 7072db63..48e8259a 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
@@ -245,7 +245,11 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
         List<OtherDraftUserVO> otherDraftUserVOS = data.parseOtherDraftUserVOS();
         List<InspectContentVO> inspectContentVOS = data.parseInspectContents();
         String xmlNodeId = record.getNodeId();
-        boolean pass = (boolean) taskService.getVariable(taskId, "pass");
+        Object passObject = taskService.getVariable(taskId, "pass");
+        boolean pass = true;
+        if (passObject != null) {
+             pass = (boolean) passObject;
+        }
         // 某些节点需要对数据进行特殊处理
         switch (xmlNodeId) {
             case OTHER_DRAFT_USER_UPLOAD:
@@ -320,6 +324,8 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
         ProcessEsRevision data;
         Map<String, Object> flowUser;
         String contactUser = (String) runtimeService.getVariable(executionId, "contactUser");
+        // 更新审批表为完成，填充数据
+        actFlowCommonService.updateApprovalInfo(commonVO, taskId, pass);
         switch (xmlNodeId) {
             case MAIN_DRAFT_USER_DISTRIBUTE:
                 // 判断是否分发 设置流程变量
@@ -528,8 +534,6 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
             // 设置流程变量
             runtimeService.setVariable(processInstanceId, "pass", false);
         }
-        // 更新审批表为完成，填充数据
-        actFlowCommonService.updateApprovalInfo(commonVO, taskId, pass);
         // 审批节点
         actFlowCommonService.completeTask(taskId, userId);
     }