From 97fbd7c38308e8202c1643689f12d20c36ccaf77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Tue, 23 Jul 2024 10:26:49 +0800
Subject: [PATCH] fix:87383

---
 .../java/com/jero/modules/activiti/common/ActivitiCommon.java | 4 ++++
 .../service/impl/ProcessMarketStandardReleaseServiceImpl.java | 2 +-
 .../ni/service/impl/ProcessNewStandardImportServiceImpl.java  | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/common/ActivitiCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/common/ActivitiCommon.java
index 1d53d500..817074d5 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/common/ActivitiCommon.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/common/ActivitiCommon.java
@@ -18,4 +18,8 @@ public class ActivitiCommon {
      * 驳回
      */
     public static final int COMMIT_FLAG2 = 2;
+    /**
+     * 未处理
+     */
+    public static final int COMMIT_FLAG3 = 3;
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java
index a4ea2630..e86c6d4b 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java
@@ -202,7 +202,7 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl<Process
             update.ne(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue());
             update.eq(ProcessApprovalRecord::getNodeId,xmlNodeId);
             update.set(ProcessApprovalRecord::getCommitText,"未处理");
-            update.set(ProcessApprovalRecord::getCommitFlag,"未处理");
+            update.set(ProcessApprovalRecord::getCommitFlag,ActivitiCommon.COMMIT_FLAG3);
             update.set(ProcessApprovalRecord::getFinishFlag,FinishFlagEnum.COMPLETE.getValue());
             update.set(ProcessApprovalRecord::getEndTime,new Date());
             processApprovalRecordService.update(update);
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java
index 34df047f..e698aee6 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java
@@ -201,7 +201,7 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl<ProcessNewS
             update.ne(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue());
             update.eq(ProcessApprovalRecord::getNodeId,xmlNodeId);
             update.set(ProcessApprovalRecord::getCommitText,"未处理");
-            update.set(ProcessApprovalRecord::getCommitFlag,"未处理");
+            update.set(ProcessApprovalRecord::getCommitFlag,ActivitiCommon.COMMIT_FLAG3);
             update.set(ProcessApprovalRecord::getFinishFlag,FinishFlagEnum.COMPLETE.getValue());
             update.set(ProcessApprovalRecord::getEndTime,new Date());
             processApprovalRecordService.update(update);