优化审批拒绝逻辑支持

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

@@ -29,7 +29,4 @@ public class RejectTaskDTO {
     @Schema(description = "原因")
     private String reason;
 
-    @Schema(description = "终止流程")
-    private boolean termination;
-
 }

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

@@ -27,5 +27,8 @@ public class TaskApprovalDTO {
     @Schema(description = "意见评论")
     private String content;
 
+    @Schema(description = "终止流程")
+    private boolean termination;
+
 
 }

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

@@ -300,11 +300,6 @@ public class ProcessTaskServiceImpl implements IProcessTaskService {
         ApiAssert.isEmpty(flwTask, "当前ID执行任务不存在");
         TaskService taskService = flowLongEngine.taskService();
         this.processApprovalOpinion(dto.getReason());
-        if (dto.isTermination()) {
-            // 驳回并终止流程
-            runtimeService.reject(flwTask.getInstanceId(), FlowHelper.getFlowCreator());
-            return true;
-        }
         return taskService.rejectTask(flwTask, FlowHelper.getFlowCreator(), dto.getArgs()).isPresent();
     }
 
@@ -357,6 +352,11 @@ public class ProcessTaskServiceImpl implements IProcessTaskService {
     public boolean rejection(TaskApprovalDTO dto) {
         FlwTask flwTask = this.getFlwTask(dto.getTaskId());
         this.processApprovalOpinion(dto.getContent());
+        if (dto.isTermination()) {
+            // 驳回并终止流程
+            runtimeService.reject(flwTask.getInstanceId(), FlowHelper.getFlowCreator());
+            return true;
+        }
         return flowLongEngine.taskService().rejectTask(flwTask, FlowHelper.getFlowCreator()).isPresent();
     }