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 64cd9e2c..a489038e 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 @@ -157,6 +157,25 @@ public class ActFlowCommonService { processApprovalRecordService.updateById(approvalRecord); } + /** + * 发起流程之后更新审批表(审批意见置空) + * @param commonVO + * @param taskId + * @param pass + */ + public void updateApprovalInfoStart(CommonVO commonVO, String taskId, boolean pass) { + ProcessApprovalRecord approvalRecord = processApprovalRecordService.getToDoByTaskId(taskId); + approvalRecord.setCommitText(commonVO.getCommitText()); + approvalRecord.setCommitFile(commonVO.getCommitFile()); + approvalRecord.setFinishFlag(FinishFlagEnum.COMPLETE.getValue()); + approvalRecord.setEndTime(new Date()); + // 使用流程引擎根据TaskId找到NodeId + Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); + String nodeId = task.getTaskDefinitionKey(); + approvalRecord.setNodeId(nodeId); + processApprovalRecordService.updateById(approvalRecord); + } + public ProcessApprovalRecord getNodeIdByTaskId(String taskId) { return processApprovalRecordService.getToDoByTaskId(taskId); } @@ -257,7 +276,7 @@ public class ActFlowCommonService { log.info("匹配到的任务ID:{}", map.get("taskId").toString()); String taskId = map.get("taskId").toString(); // 更新审批表为完成,填充数据 - this.updateApprovalInfo(commonVO, taskId, true); + this.updateApprovalInfoStart(commonVO, taskId, true); this.completeTask(taskId, userId); break; }