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