Pārlūkot izejas kodu

调整任务流程信息获取逻辑

hubin 1 gadu atpakaļ
vecāks
revīzija
f1aeb481ae

+ 2 - 6
src/main/java/com/aizuda/boot/modules/flw/controller/ProcessTaskController.java

@@ -68,14 +68,10 @@ public class ProcessTaskController extends ApiController {
     }
 
     @Operation(summary = "审批信息")
-    @Parameters({
-            @Parameter(name = "instanceId", description = "流程实例ID", required = true),
-            @Parameter(name = "taskId", description = "任务ID")
-    })
     @Permission("flw:processTask:approval")
     @PostMapping("/approval-info")
-    public TaskApprovalVO approvalInfo(@RequestParam Long instanceId, @RequestParam(required = false) Long taskId) {
-        return processTaskService.approvalInfo(instanceId, taskId);
+    public TaskApprovalVO approvalInfo(@Validated @RequestBody ProcessInfoDTO dto) {
+        return processTaskService.approvalInfo(dto);
     }
 
     @Operation(summary = "以前的节点名称列表")

+ 26 - 0
src/main/java/com/aizuda/boot/modules/flw/entity/dto/ProcessInfoDTO.java

@@ -0,0 +1,26 @@
+package com.aizuda.boot.modules.flw.entity.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.PositiveOrZero;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 流程审批 DTO
+ */
+@Getter
+@Setter
+public class ProcessInfoDTO {
+
+    @Schema(description = "流程实例ID")
+    @NotNull
+    @PositiveOrZero
+    private Long instanceId;
+
+    @Schema(description = "流程任务ID")
+    @PositiveOrZero
+    private Long taskId;
+
+}

+ 1 - 4
src/main/java/com/aizuda/boot/modules/flw/service/IProcessTaskService.java

@@ -43,11 +43,8 @@ public interface IProcessTaskService {
 
     /**
      * 审批信息
-     *
-     * @param instanceId 流程实例ID
-     * @param taskId     任务ID
      */
-    TaskApprovalVO approvalInfo(Long instanceId, Long taskId);
+    TaskApprovalVO approvalInfo(ProcessInfoDTO dto);
 
     /**
      * 根据任务ID查询以前的节点名称列表

+ 5 - 4
src/main/java/com/aizuda/boot/modules/flw/service/impl/ProcessTaskServiceImpl.java

@@ -83,11 +83,12 @@ public class ProcessTaskServiceImpl implements IProcessTaskService {
     }
 
     @Override
-    public TaskApprovalVO approvalInfo(Long instanceId, Long taskId) {
+    public TaskApprovalVO approvalInfo(ProcessInfoDTO dto) {
+        final Long instanceId = dto.getInstanceId();
         FlwInstance flwInstance = flowLongEngine.queryService().getInstance(instanceId);
         ApiAssert.isEmpty(flwInstance, "未发现指定审批流程");
         TaskApprovalVO vo = new TaskApprovalVO();
-        vo.setTaskId(taskId);
+        vo.setTaskId(dto.getTaskId());
         vo.setCreateId(flwInstance.getCreateId());
         vo.setCreateBy(flwInstance.getCreateBy());
         vo.setCreateTime(flwInstance.getCreateTime());
@@ -97,8 +98,8 @@ public class ProcessTaskServiceImpl implements IProcessTaskService {
             vo.setFormContent(flwProcessForm.getContent());
         }
         // 表单配置权限
-        if (null != taskId) {
-            FlwTask flwTask = this.getFlwTask(taskId);
+        if (null != dto.getTaskId()) {
+            FlwTask flwTask = this.getFlwTask(dto.getTaskId());
             FlwExtInstance flwExtInstance = extInstanceMapper.selectById(instanceId);
             ProcessModel processModel = flwExtInstance.model();
             NodeModel nodeModel = processModel.getNode(flwTask.getTaskName());