From b6ab7db0ed2f1c3f4c8401a7d6e3a237a8254598 Mon Sep 17 00:00:00 2001 From: yangqicheng Date: Fri, 6 Sep 2024 14:10:04 +0800 Subject: [PATCH] =?UTF-8?q?REQ-2924-=E8=B0=83=E6=95=B4=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E9=80=80=E5=9B=9E=E8=8A=82=E7=82=B9=E5=88=97=E8=A1=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/feign/bpmn/ProcessTaskApi.java | 9 +++--- .../bpmn/task/BpmnUserTaskNodeDTO.java | 32 ------------------- .../core/service/BpmnProcessTaskService.java | 3 +- .../impl/BpmnProcessTaskServiceImpl.java | 3 +- .../web/bpmn/BpmnProcessTaskController.java | 9 +++--- .../starter/api/WorkflowCoreService.java | 9 +++--- 6 files changed, 15 insertions(+), 50 deletions(-) delete mode 100644 workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/task/BpmnUserTaskNodeDTO.java diff --git a/workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/bpmn/ProcessTaskApi.java b/workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/bpmn/ProcessTaskApi.java index 214ab75a8..0d9828443 100644 --- a/workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/bpmn/ProcessTaskApi.java +++ b/workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/bpmn/ProcessTaskApi.java @@ -13,7 +13,6 @@ import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskCountersignDTO; import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskPageSearchDTO; import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskRemindDTO; import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskTransferDTO; -import cn.axzo.workflow.common.model.request.bpmn.task.BpmnUserTaskNodeDTO; import cn.axzo.workflow.common.model.response.BpmPageResult; import cn.axzo.workflow.common.model.response.bpmn.BatchOperationResultVO; import cn.axzo.workflow.common.model.response.bpmn.task.BpmnHistoricTaskInstanceGroupVO; @@ -74,12 +73,12 @@ public interface ProcessTaskApi { /** * 获取当前节点可退回节点选项列表 - * @param bpmnUserTaskNodeDTO 参数 - * @return + * @param taskId 当前任务id + * @return 可以退回节点列表 */ @Operation(summary = "获取当前节点可退回节点选项列表") - @PostMapping("/api/process/task/back/optional/nodes") - CommonResponse> getBackOptionalNodes(@Validated @RequestBody BpmnUserTaskNodeDTO bpmnUserTaskNodeDTO); + @GetMapping("/api/process/task/back/optional/nodes") + CommonResponse> getBackOptionalNodes(@RequestParam @NotBlank(message = "任务id不能为空") String taskId); /** * 回退到指定节点 diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/task/BpmnUserTaskNodeDTO.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/task/BpmnUserTaskNodeDTO.java deleted file mode 100644 index c1a228742..000000000 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/task/BpmnUserTaskNodeDTO.java +++ /dev/null @@ -1,32 +0,0 @@ -package cn.axzo.workflow.common.model.request.bpmn.task; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; - -import javax.validation.constraints.NotBlank; - -@ApiModel("节点信息模型") -@Data -@Accessors(chain = true) -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class BpmnUserTaskNodeDTO { - - @ApiModelProperty(value = "租户id") - @NotBlank(message = "租户id不能为空") - private String tenantId; - - @ApiModelProperty(value = "流程实例id") - @NotBlank(message = "流程实例id不能为空") - private String processInstanceId; - - @ApiModelProperty(value = "审批任务id") - @NotBlank(message = "审批任务id不能为空") - private String taskId; -} diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/BpmnProcessTaskService.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/BpmnProcessTaskService.java index f78bff7bc..346b2fd31 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/BpmnProcessTaskService.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/BpmnProcessTaskService.java @@ -56,10 +56,9 @@ public interface BpmnProcessTaskService { /** * 退回到指定节点，可以退回节点选项 - * @param processInstanceId 流程实例id * @param taskId 任务id */ - List getApproveOptionalNodes(String processInstanceId, String taskId, String tenantId); + List getBackOptionalNodes(String taskId); /** * 驳回 diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java index 283cdce74..77d7a6646 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmnProcessTaskServiceImpl.java @@ -343,11 +343,12 @@ public class BpmnProcessTaskServiceImpl implements BpmnProcessTaskService { } @Override - public List getApproveOptionalNodes(String processInstanceId, String taskId, String tenantId) { + public List getBackOptionalNodes(String taskId) { Task task = processEngineConfiguration.getTaskService().createTaskQuery().taskId(taskId).singleResult(); if (task == null) { throw new WorkflowEngineException(PROCESS_TASK_NOT_EXISTS); } + String processInstanceId = task.getProcessInstanceId(); //1.获取当前的流程实例 ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult(); if (processInstance == null) { diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessTaskController.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessTaskController.java index f2c638b06..096805280 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessTaskController.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessTaskController.java @@ -14,7 +14,6 @@ import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskCountersignDTO; import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskPageSearchDTO; import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskRemindDTO; import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskTransferDTO; -import cn.axzo.workflow.common.model.request.bpmn.task.BpmnUserTaskNodeDTO; import cn.axzo.workflow.common.model.response.BpmPageResult; import cn.axzo.workflow.common.model.response.bpmn.BatchOperationResultVO; import cn.axzo.workflow.common.model.response.bpmn.task.BpmnHistoricTaskInstanceGroupVO; @@ -123,15 +122,15 @@ public class BpmnProcessTaskController implements ProcessTaskApi { /** * 获取当前节点可退回节点选项列表 - * @param dto 参数 + * @param taskId 当前任务id * @return 可选退回节点列表 */ @Operation(summary = "获取当前节点可退回节点选项列表") - @PostMapping("/back/optional/nodes") + @GetMapping("/back/optional/nodes") @Override @RepeatSubmit - public CommonResponse> getBackOptionalNodes(@RequestBody @Validated BpmnUserTaskNodeDTO dto) { - List approveOptionalNodes = bpmnProcessTaskService.getApproveOptionalNodes(dto.getProcessInstanceId(), dto.getTaskId(), dto.getTenantId()); + public CommonResponse> getBackOptionalNodes(@RequestParam @NotBlank(message = "任务id不能为空") String taskId) { + List approveOptionalNodes = bpmnProcessTaskService.getBackOptionalNodes(taskId); return success(approveOptionalNodes); } diff --git a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/api/WorkflowCoreService.java b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/api/WorkflowCoreService.java index fd86467fc..b9074162b 100644 --- a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/api/WorkflowCoreService.java +++ b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/api/WorkflowCoreService.java @@ -15,7 +15,6 @@ import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskBackAuditDTO; import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskCommentDTO; import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskCountersignDTO; import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskTransferDTO; -import cn.axzo.workflow.common.model.request.bpmn.task.BpmnUserTaskNodeDTO; import cn.axzo.workflow.common.model.response.bpmn.BatchOperationResultVO; import cn.axzo.workflow.common.model.response.bpmn.process.BpmnProcessInstanceVO; import cn.axzo.workflow.common.util.ThreadUtil; @@ -178,12 +177,12 @@ public interface WorkflowCoreService { /** * 获取当前节点可退回节点选项列表 - * @param bpmnUserTaskNodeDTO 参数 - * @return + * @param taskId 当前任务id + * @return 可以退回节点列表 */ @Operation(summary = "获取当前节点可退回节点选项列表") - @PostMapping("/api/process/task/back/optional/nodes") - List getBackOptionalNodes(@Validated @RequestBody BpmnUserTaskNodeDTO bpmnUserTaskNodeDTO); + @GetMapping("/api/process/task/back/optional/nodes") + List getBackOptionalNodes(@RequestParam @NotBlank(message = "任务id不能为空") String taskId); /** * 回退到指定节点