Merge remote-tracking branch 'origin/feature/REQ-2924' into feature/REQ-2924

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 参数
+     * @param taskId 当前任务id
-     * @return
+     * @return 可以退回节点列表
      */
     @Operation(summary = "获取当前节点可退回节点选项列表")
-    @PostMapping("/api/process/task/back/optional/nodes")
+    @GetMapping("/api/process/task/back/optional/nodes")
-    CommonResponse<List<BpmnOptionalNodeDTO>> getBackOptionalNodes(@Validated @RequestBody BpmnUserTaskNodeDTO bpmnUserTaskNodeDTO);
+    CommonResponse<List<BpmnOptionalNodeDTO>> getBackOptionalNodes(@RequestParam @NotBlank(message = "任务id不能为空") String taskId);
 
     /**
      * 回退到指定节点

workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/task/BpmnUserTaskNodeDTO.java

@@ -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;
-}

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<BpmnOptionalNodeDTO> getApproveOptionalNodes(String processInstanceId, String taskId, String tenantId);
+    List<BpmnOptionalNodeDTO> getBackOptionalNodes(String taskId);
 
     /**
      * 驳回

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<BpmnOptionalNodeDTO> getApproveOptionalNodes(String processInstanceId, String taskId, String tenantId) {
+    public List<BpmnOptionalNodeDTO> 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) {

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<List<BpmnOptionalNodeDTO>> getBackOptionalNodes(@RequestBody @Validated BpmnUserTaskNodeDTO dto) {
+    public CommonResponse<List<BpmnOptionalNodeDTO>> getBackOptionalNodes(@RequestParam @NotBlank(message = "任务id不能为空") String taskId) {
-        List<BpmnOptionalNodeDTO> approveOptionalNodes = bpmnProcessTaskService.getApproveOptionalNodes(dto.getProcessInstanceId(), dto.getTaskId(), dto.getTenantId());
+        List<BpmnOptionalNodeDTO> approveOptionalNodes = bpmnProcessTaskService.getBackOptionalNodes(taskId);
         return success(approveOptionalNodes);
     }
 

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 参数
+     * @param taskId 当前任务id
-     * @return
+     * @return 可以退回节点列表
      */
     @Operation(summary = "获取当前节点可退回节点选项列表")
-    @PostMapping("/api/process/task/back/optional/nodes")
+    @GetMapping("/api/process/task/back/optional/nodes")
-    List<BpmnOptionalNodeDTO> getBackOptionalNodes(@Validated @RequestBody BpmnUserTaskNodeDTO bpmnUserTaskNodeDTO);
+    List<BpmnOptionalNodeDTO> getBackOptionalNodes(@RequestParam @NotBlank(message = "任务id不能为空") String taskId);
 
     /**
      * 回退到指定节点