From ecfbb646b32a8d7c49a6d3f52b78efedefe5fa06 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 28 Nov 2023 18:40:32 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B0=81=E5=AD=98=E9=A9=B3=E5=9B=9E?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/CounterSignNodeNameConstants.java      | 11 +++++++++++
 .../common/service/ActFlowCommonService.java      | 15 +++++++++++++++
 .../service/impl/ProcessEsArchiveServiceImpl.java |  5 +++++
 3 files changed, 31 insertions(+)
 create mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/CounterSignNodeNameConstants.java

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/CounterSignNodeNameConstants.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/CounterSignNodeNameConstants.java
new file mode 100644
index 00000000..f2cb3249
--- /dev/null
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/CounterSignNodeNameConstants.java
@@ -0,0 +1,11 @@
+package com.jero.modules.activiti.process.common.entity;
+
+/**
+ * @author: Mzaxd
+ * @Date: 2023/11/28 16:44
+ */
+public class CounterSignNodeNameConstants {
+
+    public static final String COUNTER_SIGN_NODE_NAME = "相关人员会签";
+
+}
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 fa9a67f5..acc89ba7 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
@@ -9,6 +9,7 @@ import com.jero.modules.activiti.entity.ProcessAll;
 import com.jero.modules.activiti.entity.ProcessApprovalRecord;
 import com.jero.modules.activiti.enums.CommitFlagEnum;
 import com.jero.modules.activiti.enums.FinishFlagEnum;
+import com.jero.modules.activiti.enums.ProcessStatusEnum;
 import com.jero.modules.activiti.enums.ProcessTypeEnum;
 import com.jero.modules.activiti.mapper.ProcessNodeMapper;
 import com.jero.modules.activiti.process.common.entity.CommonVO;
@@ -429,4 +430,18 @@ public class ActFlowCommonService {
         draftWrapper.eq(ProcessDraft::getProcessInstanceId, processInstanceId);
         processDraftService.remove(draftWrapper);
     }
+
+    /**
+     * 会签节点驳回后，将其余节点recode设置为 未处理 状态
+     * @param prcId
+     * @param nodeName
+     */
+    public void updateOtherCountersignRecodeStatus(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, ProcessStatusEnum.WITHDRAWN.getValue());
+        processApprovalRecordService.update(updateWrapper);
+    }
 }
\ No newline at end of file
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java
index 4391ccf7..38dc4df9 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java
@@ -8,6 +8,7 @@ import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.modules.activiti.enums.ProcessTypeEnum;
 import com.jero.modules.activiti.process.common.entity.CommonVO;
+import com.jero.modules.activiti.process.common.entity.CounterSignNodeNameConstants;
 import com.jero.modules.activiti.process.common.entity.ProcessDraft;
 import com.jero.modules.activiti.process.common.enums.ProcessType;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
@@ -162,6 +163,10 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl<ProcessEsArchiveMap
         actFlowCommonService.completeTask(taskId, userId);
         // 删除草稿
         actFlowCommonService.removeDraft(commonVO);
+        // 如果是会签节点，驳回后要将其余节点recode设置为 未处理 状态
+        if (!pass) {
+            actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.COUNTER_SIGN_NODE_NAME);
+        }
     }
 
     @Override