From 04a48888f3f4fb6278080890df06c817999bc2d7 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 28 Nov 2023 19:06:25 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=BA=9F=E6=AD=A2=20=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=20=E5=90=AF=E7=94=A8=E6=B5=81=E7=A8=8B=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

---
 .../process/common/entity/CounterSignNodeNameConstants.java  | 2 ++
 .../esAbolish/service/impl/ProcessEsAbolishServiceImpl.java  | 5 +++++
 .../esChange/service/impl/ProcessEsChangeServiceImpl.java    | 5 +++++
 .../esEnable/service/impl/ProcessEsEnableServiceImpl.java    | 5 +++++
 4 files changed, 17 insertions(+)

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
index f2cb3249..762d5fd7 100644
--- 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
@@ -8,4 +8,6 @@ public class CounterSignNodeNameConstants {
 
     public static final String COUNTER_SIGN_NODE_NAME = "相关人员会签";
 
+    public static final String ES_CHANGE_COUNTER_SIGN_NODE_NAME = "相关人员校对";
+
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java
index 3e2eef76..41d421ed 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.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 ProcessEsAbolishServiceImpl extends ServiceImpl<ProcessEsAbolishMap
         actFlowCommonService.completeTask(taskId, userId);
         // 删除草稿
         actFlowCommonService.removeDraft(commonVO);
+        // 如果是会签节点，驳回后要将其余节点recode设置为 未处理 状态
+        if (!pass) {
+            actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.COUNTER_SIGN_NODE_NAME);
+        }
     }
 
     @Override
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java
index 2907352c..163d0380 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java
@@ -10,6 +10,7 @@ import com.jero.common.exception.JeroBootException;
 import com.jero.modules.activiti.entity.ProcessAll;
 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;
@@ -163,6 +164,10 @@ public class ProcessEsChangeServiceImpl extends ServiceImpl<ProcessEsChangeMappe
         actFlowCommonService.completeTask(taskId, userId);
         // 删除草稿
         actFlowCommonService.removeDraft(commonVO);
+        // 如果是会签节点，驳回后要将其余节点recode设置为 未处理 状态
+        if (!pass) {
+            actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.ES_CHANGE_COUNTER_SIGN_NODE_NAME);
+        }
     }
 
     @Override
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java
index 40516eee..ccae4199 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.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 ProcessEsEnableServiceImpl extends ServiceImpl<ProcessEsEnableMappe
         actFlowCommonService.completeTask(taskId, userId);
         // 删除草稿
         actFlowCommonService.removeDraft(commonVO);
+        // 如果是会签节点，驳回后要将其余节点recode设置为 未处理 状态
+        if (!pass) {
+            actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.COUNTER_SIGN_NODE_NAME);
+        }
     }
 
     @Override