From a4ecd31d9daccda7139f99a7fadef929f8971958 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, 16 Jul 2024 10:56:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=B5=81=E7=A8=8B=E3=80=81=E5=B8=82=E5=9C=BA?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=8F=91=E5=B8=83=E6=B5=81=E7=A8=8B=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E6=84=8F=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/modules/activiti/common/ActivitiCommon.java  | 8 ++++++++
 .../process/common/service/ActFlowCommonService.java      | 3 +++
 .../impl/ProcessMarketStandardReleaseServiceImpl.java     | 3 +++
 .../service/impl/ProcessNewStandardImportServiceImpl.java | 3 +++
 4 files changed, 17 insertions(+)

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 8ba1151f..1d53d500 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
@@ -10,4 +10,12 @@ public class ActivitiCommon {
     public static final String PARENT_TASK_ID = "parentTaskId";
     public static final String DISTRIBUTE = "distribute";
     public static final String UNALLOCATED_QUANTITY = "unallocatedQuantity";
+    /**
+     * 通过
+     */
+    public static final int COMMIT_FLAG1 = 1;
+    /**
+     * 驳回
+     */
+    public static final int COMMIT_FLAG2 = 2;
 }
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 8787d5aa..c6233f01 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
@@ -139,6 +139,9 @@ public class ActFlowCommonService {
         ProcessApprovalRecord approvalRecord = processApprovalRecordService.getByTaskId(taskId);
         approvalRecord.setCommitText(processTask.getHandleText());
         approvalRecord.setCommitFile(processTask.getHandleFile());
+        if(!Objects.isNull(processTask.getCommitFlag())){
+            approvalRecord.setCommitFlag(processTask.getCommitFlag());
+        }
         approvalRecord.setFinishFlag(FinishFlagEnum.COMPLETE.getValue());
         approvalRecord.setEndTime(new Date());
         // 使用流程引擎根据TaskId找到NodeId
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 0ef99935..e8ed5bd6 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
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.exception.JeroBootException;
+import com.jero.modules.activiti.common.ActivitiCommon;
 import com.jero.modules.activiti.entity.ProcessAll;
 import com.jero.modules.activiti.entity.ProcessApprovalRecord;
 import com.jero.modules.activiti.enums.FinishFlagEnum;
@@ -176,6 +177,8 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl<Process
         // 发起节点 更新业务数据
         if(Objects.equals(ProcessMarketStandardReleaseConstants.STANDARD_ENGINEER_START,xmlNodeId)){
             startNodeBusProcess(processInfoVO);
+        }else{
+            processTask.setCommitFlag(pass ? ActivitiCommon.COMMIT_FLAG1 : ActivitiCommon.COMMIT_FLAG2);
         }
         String userId = actFlowCommonService.getOriginTaskAssignee(taskId);
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
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 44d74ef4..4fc08664 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
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.api.SendMessageAPI;
 import com.jero.common.api.dto.message.SendMessageDTO;
 import com.jero.common.exception.JeroBootException;
+import com.jero.modules.activiti.common.ActivitiCommon;
 import com.jero.modules.activiti.entity.ProcessAll;
 import com.jero.modules.activiti.entity.ProcessApprovalRecord;
 import com.jero.modules.activiti.enums.FinishFlagEnum;
@@ -171,6 +172,8 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl<ProcessNewS
         // 发起节点 更新业务数据
         if(Objects.equals(ProcessNewStandardImportConstants.STANDARD_ENGINEER_START,xmlNodeId)){
             startNodeBusProcess(processInfoVO);
+        }else{
+            processTask.setCommitFlag(pass ? ActivitiCommon.COMMIT_FLAG1 : ActivitiCommon.COMMIT_FLAG2);
         }
         String userId = actFlowCommonService.getOriginTaskAssignee(taskId);
         String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);