删除多余的统计任务状态接口对象

src/main/java/com/keymobile/indicators/api/hytobacco/TaskCtrl.java

@@ -88,7 +88,9 @@ public class TaskCtrl  {
     @ApiOperation("根据id获取填报任务")
     @GetMapping("getById")
     public Task getById(@ApiParam("任务id") @RequestParam String id) {
-        return taskService.getById(id, true, true);
+        Task task = taskService.getById(id, true, true);
+
+        return task;
     }
 
 
@@ -152,7 +154,7 @@ public class TaskCtrl  {
     }
     @ApiOperation("任务状态统计")
     @PostMapping("stateCounts")
-    public TaskStateCounts stateCounts(@RequestBody QueryTaskParam param){
+    public TaskAnalysisResult stateCounts(@RequestBody QueryTaskParam param){
         return taskService.stateCounts(param);
     }
 

src/main/java/com/keymobile/indicators/model/entity/dataenter/TaskAnalysisResult.java

@@ -21,6 +21,14 @@ public class TaskAnalysisResult {
     @ApiModelProperty("已审核通过总数")
     private int passCount;
 
+
+    @ApiModelProperty("已审核数")
+    private Integer  auditCount;
+    @ApiModelProperty("填报超时数")
+    private Integer addTimeoutCount;
+    @ApiModelProperty("审核超时数")
+    private Integer auditTimeoutCount;
+
 //    @ApiModelProperty("被驳回总数")
 //    private int rejectCount;
 

src/main/java/com/keymobile/indicators/model/entity/dataenter/TaskStateCounts.java

-package com.keymobile.indicators.model.entity.dataenter;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel("任务状态统计")
-@Data
-public class TaskStateCounts {
-
-    @ApiModelProperty("已经审核数")
-    private Integer  auditCount;
-    @ApiModelProperty("填报超时数")
-    private Integer addTimeoutCount;
-    @ApiModelProperty("审核超时数")
-    private Integer auditTimeoutCount;
-}

src/main/java/com/keymobile/indicators/service/dataenter/TaskService.java

@@ -202,5 +202,5 @@ public interface TaskService {
       * 审核超时数目
       * 填报超时的数目
       * **/
-    TaskStateCounts stateCounts(QueryTaskParam param);
+     TaskAnalysisResult stateCounts(QueryTaskParam param);
 }

src/main/java/com/keymobile/indicators/service/dataenter/impl/TaskServiceImpl.java

@@ -750,7 +750,7 @@ public class TaskServiceImpl implements TaskService {
 
 
     @Override
-    public TaskStateCounts stateCounts(QueryTaskParam param) {
+    public TaskAnalysisResult stateCounts(QueryTaskParam param) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         String s = sdf.format(new Date());
         Date date=null;
@@ -759,7 +759,7 @@ public class TaskServiceImpl implements TaskService {
         } catch (ParseException e) {
             e.printStackTrace();
         }
-        TaskStateCounts taskStateCounts = new TaskStateCounts();
+        TaskAnalysisResult taskStateCounts = new TaskAnalysisResult();
 
         //查出审核过的数目--大于APPLY_STATE_AUDITING就是审核过了
         param.setStatus(Constants.APPLY_STATE_AUDITING);