From 4d672b9a940f610f51ff08e2dc11970d371ab900 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Tue, 9 Jan 2024 17:45:25 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2079900=20=E4=BC=81=E6=A0=87=E5=BA=9F?= =?UTF-8?q?=E6=AD=A2/=E5=B0=81=E5=AD=98/=E5=90=AF=E7=94=A8=E6=B5=81?= =?UTF-8?q?=E7=A8=8B--=E5=8F=91=E8=B5=B7=E4=BA=BA=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E5=92=8C=E7=BC=96=E8=BE=91=E7=9A=84=E8=8A=82=E7=82=B9=E7=9A=84?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=84=8F=E8=A7=81=E5=BA=94=E8=AF=A5=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/service/ActFlowCommonService.java | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) 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; }