修改新法规导入流程、市场清单发布流程审批意见

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;
 }

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

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();

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);