From 08bb0510d9bc9b927f9b774ffa696d4613b7ca42 Mon Sep 17 00:00:00 2001 From: konbai <1527468660@qq.com> Date: Sun, 14 Apr 2024 21:20:16 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=A8=A1?= =?UTF-8?q?=E5=9D=97):=20=E6=96=B0=E5=A2=9E=20=E5=8F=96=E6=B6=88=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E7=8A=B6=E6=80=81=E3=80=82=20=E6=84=9F=E8=B0=A2=20@?= =?UTF-8?q?=E9=86=92=E5=93=A5=20[pr:67](https://gitee.com/KonBAI-Q/ruoyi-f?= =?UTF-8?q?lowable-plus/pulls/67)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/workflow/WfTaskController.java | 2 +- .../ruoyi/workflow/service/impl/WfTaskServiceImpl.java | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfTaskController.java index 01345c33..97b0ec84 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfTaskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfTaskController.java @@ -31,7 +31,7 @@ public class WfTaskController { private final IWfTaskService flowTaskService; /** - * 取消申请 + * 取消流程 */ @PostMapping(value = "/stopProcess") @SaCheckPermission("workflow:process:cancel") diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfTaskServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfTaskServiceImpl.java index 2ba790a8..993f8904 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfTaskServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfTaskServiceImpl.java @@ -386,8 +386,8 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ */ @Override public void stopProcess(WfTaskBo bo) { - List task = taskService.createTaskQuery().processInstanceId(bo.getProcInsId()).list(); - if (CollectionUtils.isEmpty(task)) { + List taskList = taskService.createTaskQuery().processInstanceId(bo.getProcInsId()).list(); + if (CollectionUtils.isEmpty(taskList)) { throw new RuntimeException("流程未启动或已执行完成，取消申请失败"); } @@ -399,8 +399,10 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ List endNodes = process.findFlowElementsOfType(EndEvent.class, false); if (CollectionUtils.isNotEmpty(endNodes)) { Authentication.setAuthenticatedUserId(TaskUtils.getUserId()); -// taskService.addComment(task.getId(), processInstance.getProcessInstanceId(), FlowComment.STOP.getType(), -// StringUtils.isBlank(flowTaskVo.getComment()) ? "取消申请" : flowTaskVo.getComment()); + runtimeService.setVariable(processInstance.getId(), ProcessConstants.PROCESS_STATUS_KEY, ProcessStatus.CANCELED.getStatus()); + for (Task task : taskList) { + taskService.addComment(task.getId(), processInstance.getProcessInstanceId(), FlowComment.STOP.getType(), "取消流程"); + } // 获取当前流程最后一个节点 String endId = endNodes.get(0).getId(); List executions = runtimeService.createExecutionQuery()