委派转办合并为转交

src/main/java/com/aizuda/boot/modules/flw/controller/ProcessTaskController.java

@@ -114,20 +114,13 @@ public class ProcessTaskController extends ApiController {
         return processTaskService.claim(taskId, FlowHelper.getFlowCreator());
     }
 
-    @Operation(summary = "转办任务")
+    @Operation(summary = "转交任务")
     @Permission("flw:processTask:transfer")
     @PostMapping("/transfer")
     public boolean transfer(@Validate @RequestBody TaskAssigneeDTO dto) {
         return processTaskService.transfer(dto);
     }
 
-    @Operation(summary = "委派任务")
-    @Permission("flw:processTask:resume")
-    @PostMapping("/delegate")
-    public boolean delegate(@Validate @RequestBody TaskAssigneeDTO dto) {
-        return processTaskService.delegate(dto);
-    }
-
     @Operation(summary = "执行任务")
     @Permission("flw:processTask:execute")
     @PostMapping("/execute")

src/main/java/com/aizuda/boot/modules/flw/entity/dto/TaskAssigneeDTO.java

@@ -23,6 +23,10 @@ public class TaskAssigneeDTO {
     @PositiveOrZero
     private Long taskId;
 
+    @Schema(description = "类型 0，转办 1，委派")
+    @NotNull
+    private Integer type;
+
     @Schema(description = "用户ID")
     @NotNull
     @PositiveOrZero

src/main/java/com/aizuda/boot/modules/flw/service/IProcessTaskService.java

@@ -98,15 +98,10 @@ public interface IProcessTaskService {
     boolean reject(RejectTaskDTO dto);
 
     /**
-     * 转办
+     * 转交
      */
     boolean transfer(TaskAssigneeDTO dto);
 
-    /**
-     * 委派
-     */
-    boolean delegate(TaskAssigneeDTO dto);
-
     /**
      * 审批评论
      */

src/main/java/com/aizuda/boot/modules/flw/service/impl/ProcessTaskServiceImpl.java

@@ -177,15 +177,14 @@ public class ProcessTaskServiceImpl implements IProcessTaskService {
     @Override
     public boolean transfer(TaskAssigneeDTO dto) {
         FlwTask flwTask = this.getFlwTask(dto.getTaskId());
-        TaskService taskService = flowLongEngine.taskService();
-        taskService.transferTask(dto.getTaskId(), FlowHelper.getFlowCreator(), dto.toFlowCreator());
-        return flwProcessApprovalService.transfer(flwTask.getInstanceId(), dto);
-    }
+        if (Objects.equals(0, dto.getType())) {
+            // 转办
+            TaskService taskService = flowLongEngine.taskService();
+            taskService.transferTask(dto.getTaskId(), FlowHelper.getFlowCreator(), dto.toFlowCreator());
+            return flwProcessApprovalService.transfer(flwTask.getInstanceId(), dto);
+        }
 
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public boolean delegate(TaskAssigneeDTO dto) {
-        FlwTask flwTask = this.getFlwTask(dto.getTaskId());
+        // 委派
         TaskService taskService = flowLongEngine.taskService();
         taskService.delegateTask(dto.getTaskId(), FlowHelper.getFlowCreator(), dto.toFlowCreator());
         return flwProcessApprovalService.delegate(flwTask.getInstanceId(), dto);