更新

src/main/java/com/keymobile/rest/controller/TaskController.java

@@ -307,22 +307,22 @@ public class TaskController {
 
     @ApiOperation(value = "进度列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "taskId", value = "活动id", paramType = "path", required = true, dataType = "string"),
-            @ApiImplicitParam(name = "status", value = "状态", paramType = "query", required = true, dataType = "integer", example = "0")
-    })
-    @GetMapping(value = "/task/progress")
-    public Object viewTasksProgress() {
-        return "";
-    }
-
-
-    @ApiOperation(value = "查看当前活动进度", hidden = true)
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "taskId", value = "活动id", paramType = "path", required = true, dataType = "long")
+            @ApiImplicitParam(name = "pageNo", value = "当前页", paramType = "query", required = true, dataType = "int", defaultValue = "1"),
+            @ApiImplicitParam(name = "pageSize", value = "当前页条数", paramType = "query", required = true, dataType = "int", defaultValue = "10"),
+            @ApiImplicitParam(name = "name", value = "名称", paramType = "query", dataType = "string"),
+            @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataType = "integer")
     })
-    @PostMapping(value = "/task/progress/{taskId}")
-    public Object viewTaskProgress(@PathVariable long taskId) {
-        return "";
+    @GetMapping(value = "/task/progresses")
+    public SimplePage viewTasksProgress(int pageNo, int pageSize, String name, Integer status) {
+        Page<Activity> page;
+        String orderBy = "descending"; //
+        String propBy = "id"; // groupBy
+        if (name != null) {
+            page = activityService.findAllByName(name, pageNo, pageSize, orderBy, propBy);
+        } else {
+            page = activityService.findAll(pageNo, pageSize, orderBy, propBy);
+        }
+        return SimplePage.of(page);
     }
 
     public Mission convertTaskToMission(Task task, Map<String, Object> params) {

src/main/java/com/keymobile/rest/vo/Mission.java

 package com.keymobile.rest.vo;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Builder;
 import lombok.Data;
 
-
+@ApiModel
 @Data
 @Builder
 public class Mission {
-
+    @ApiModelProperty(name = "id", value = "当前任务id")
     private String id;
+    @ApiModelProperty(name = "user", value = "当前登录用户")
     private String user;
+    @ApiModelProperty(name = "taskType", value = "task类别 1 个人task 2 组task")
     private int taskType;
+    @ApiModelProperty(name = "createAt", value = "任务发放时间")
     private String createAt;
+    @ApiModelProperty(name = "missionType", value = "任务类别(前身为kind) 1 填写补录数据 2 审核补录数据 3 负责人审核 4 数据回流")
     private int missionType;
+    @ApiModelProperty(name = "mission", value = "任务名称")
     private String mission;
+    @ApiModelProperty(name = "excelId", value = "模板id(前身为excelList[0])")
     private long excelId;
+    @ApiModelProperty(name = "processId", value = "流程实例id 补录任务需要用到")
     private String processId;
 }