From e8a9f9a24a5c8f5a10f84874f6797cc0aa381efc Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 25 Jun 2024 17:51:05 +0800
Subject: [PATCH] =?UTF-8?q?ci:=20=E5=88=A0=E9=99=A4=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BC=9A=E5=89=8D=E8=8A=82=E7=82=B9=E9=A9=B3?=
 =?UTF-8?q?=E5=9B=9E=E5=90=8E=E5=AF=B9=E5=85=B6=E4=BD=99=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=9A=84=E7=89=B9=E6=AE=8A=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=20=E7=AD=89=E5=BE=85=E7=BB=9F=E4=B8=80=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/service/ActFlowCommonService.java        | 13 ++++++-------
 .../service/impl/ProcessEsAbolishServiceImpl.java   |  2 +-
 .../service/impl/ProcessEsArchiveServiceImpl.java   |  2 +-
 .../service/impl/ProcessEsChangeServiceImpl.java    |  2 +-
 .../service/impl/ProcessEsEnableServiceImpl.java    |  2 +-
 .../impl/ProcessEsInitChangeServiceImpl.java        |  4 ++--
 .../service/impl/EsRevisionServiceImpl.java         |  6 +++---
 7 files changed, 15 insertions(+), 16 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 e606e559..35af8a92 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
@@ -437,13 +437,12 @@ public class ActFlowCommonService {
      * @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::getCommitText, CommitFlagEnum.UNDISPOSED.getName());
-        updateWrapper.set(ProcessApprovalRecord::getFinishFlag, null);
-        processApprovalRecordService.update(updateWrapper);
+//        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::getCommitText, CommitFlagEnum.UNDISPOSED.getName());
+//        processApprovalRecordService.update(updateWrapper);
     }
 
     /**
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 29c72bbb..6b04cde4 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
@@ -243,7 +243,7 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl<ProcessEsAbolishMap
         actFlowCommonService.removeDraft(commonVO);
         // 如果是会签节点，驳回后要将其余节点recode设置为 未处理 状态
         if (!pass) {
-            actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.COUNTER_SIGN_NODE_NAME);
+//            actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.COUNTER_SIGN_NODE_NAME);
         }
     }
 
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 ede902ec..fa56bfa7 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
@@ -249,7 +249,7 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl<ProcessEsArchiveMap
         actFlowCommonService.removeDraft(commonVO);
         // 如果是会签节点，驳回后要将其余节点recode设置为 未处理 状态
         if (!pass) {
-            actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.COUNTER_SIGN_NODE_NAME);
+//            actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.COUNTER_SIGN_NODE_NAME);
         }
     }
 }
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 08b02f19..19330b3b 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
@@ -338,7 +338,7 @@ public class ProcessEsChangeServiceImpl extends ServiceImpl<ProcessEsChangeMappe
         actFlowCommonService.removeDraft(commonVO);
         // 如果是会签节点，驳回后要将其余节点recode设置为 未处理 状态
         if (!pass) {
-            actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.ES_CHANGE_COUNTER_SIGN_NODE_NAME);
+//            actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.ES_CHANGE_COUNTER_SIGN_NODE_NAME);
         }
     }
 
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 b42a8f88..59ee074b 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
@@ -245,7 +245,7 @@ public class ProcessEsEnableServiceImpl extends ServiceImpl<ProcessEsEnableMappe
         actFlowCommonService.removeDraft(commonVO);
         // 如果是会签节点，驳回后要将其余节点recode设置为 未处理 状态
         if (!pass) {
-            actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.COUNTER_SIGN_NODE_NAME);
+//            actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.COUNTER_SIGN_NODE_NAME);
         }
     }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
index 2d1de8e9..65661825 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
@@ -339,10 +339,10 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         if (!pass) {
             // 如果是会签节点，驳回后要将其余节点recode设置为 未处理 状态
             if (taskName.equals(CounterSignNodeNameConstants.ES_INIT_CHANGE_EXPERT_NODE_NAME)) {
-                actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.ES_INIT_CHANGE_EXPERT_NODE_NAME);
+//                actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.ES_INIT_CHANGE_EXPERT_NODE_NAME);
             }
             if (taskName.equals(CounterSignNodeNameConstants.COUNTER_SIGN_NODE_NAME)) {
-                actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.COUNTER_SIGN_NODE_NAME);
+//                actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.COUNTER_SIGN_NODE_NAME);
             }
         }
     }
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 30ea877a..7e43dbe9 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
@@ -623,19 +623,19 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
             case OTHER_DRAFT_USER_CHECK:
                 // 如果是会签节点，驳回后要将其余节点recode设置为 未处理 状态
                 if (!pass) {
-                    actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.ES_REVISION_OTHER_DRAFT_USER_CHECK_NODE_NAME);
+//                    actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.ES_REVISION_OTHER_DRAFT_USER_CHECK_NODE_NAME);
                 }
                 break;
             case LEADER_APPROVAL:
                 // 如果是会签节点，驳回后要将其余节点recode设置为 未处理 状态
                 if (!pass) {
-                    actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.ES_REVISION_LEADER_APPROVAL_NODE_NAME);
+//                    actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.ES_REVISION_LEADER_APPROVAL_NODE_NAME);
                 }
                 break;
             case RELATED_LEADER_APPROVAL:
                 // 如果是会签节点，驳回后要将其余节点recode设置为 未处理 状态
                 if (!pass) {
-                    actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.ES_REVISION_RELATED_LEADER_APPROVAL_NODE_NAME);
+//                    actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.ES_REVISION_RELATED_LEADER_APPROVAL_NODE_NAME);
                 }
                 break;
             case MAIN_DRAFT_USER_RELEASE: