浏览代码

我的审批接口调整

dzx 1 年之前
父节点
当前提交
fbb0d5bb58

+ 2 - 2
src/main/java/com/xjrsoft/module/workflow/controller/WorkflowExecuteController.java

@@ -358,9 +358,9 @@ public class WorkflowExecuteController {
 
     @GetMapping("/my-examine")
     @ApiOperation(value = "我的审批")
-    public RT myExamine(@Valid MyExaminePageDto dto){
+    public RT<PageOutput<PendingTaskVo>> myExamine(@Valid MyExaminePageDto dto){
         Page<PendingTaskVo> voPage = workflowExecuteService.myExamine(new Page<>(dto.getLimit(), dto.getSize()), dto);
-        PageOutput<MyExaminePageDto> pageOutput = ConventPage.getPageOutput(voPage, MyExaminePageDto.class);
+        PageOutput<PendingTaskVo> pageOutput = ConventPage.getPageOutput(voPage, PendingTaskVo.class);
         return RT.ok(pageOutput);
     }
 

+ 15 - 1
src/main/java/com/xjrsoft/module/workflow/vo/PendingTaskVo.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.workflow.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -11,36 +12,49 @@ import java.time.LocalDateTime;
  */
 @Data
 public class PendingTaskVo {
-
+    @ApiModelProperty("主键编号")
     private Long id;
 
+    @ApiModelProperty("流水号")
     private Long serialNumber;
 
+    @ApiModelProperty("任务id")
     private String taskId;
 
+    @ApiModelProperty("流程名称")
     private String processName;
 
+    @ApiModelProperty("任务名称")
     private String taskName;
 
+    @ApiModelProperty("任务key")
     private String taskKey;
 
+    @ApiModelProperty("当前进度")
     private Integer currentProgress;
 
     private Long schemaId;
 
     private String schemaName;
 
+    @ApiModelProperty("流程id")
     private String processId;
 
+    @ApiModelProperty("发起人id")
     private Long startUserId;
 
+    @ApiModelProperty("发起人名称")
     private String startUserName;
 
+    @ApiModelProperty("创建时间")
     private LocalDateTime startTime;
 
+    @ApiModelProperty("审批时间")
     private LocalDateTime endTime;
 
+    @ApiModelProperty("任务发起时间")
     private LocalDateTime launchTime;
 
+    @ApiModelProperty("审批人id")
     private String approveUserIds;
 }