整合统计任务状态接口

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

@@ -149,13 +149,14 @@ public class TaskCtrl  {
                 }
             }
             result.setTotalCount(count);
+            //获取填报超时审核超时数
+            TaskAnalysisResult taskAnalysisResult = taskService.stateCounts(param);
+            result.setAddTimeoutCount(taskAnalysisResult.getAddTimeoutCount());
+            result.setAuditTimeoutCount(taskAnalysisResult.getAuditTimeoutCount());
+
         }
         return result;
     }
-    @ApiOperation("任务状态统计")
-    @PostMapping("stateCounts")
-    public TaskAnalysisResult stateCounts(@RequestBody QueryTaskParam param){
-        return taskService.stateCounts(param);
-    }
+
 
 }

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

@@ -22,8 +22,7 @@ public class TaskAnalysisResult {
     private int passCount;
 
 
-    @ApiModelProperty("已审核数")
-    private Integer  auditCount;
+
     @ApiModelProperty("填报超时数")
     private Integer addTimeoutCount;
     @ApiModelProperty("审核超时数")

src/main/java/com/keymobile/indicators/model/mapper/indicators/TaskMapper.java

@@ -77,9 +77,6 @@ public interface TaskMapper extends BaseMapper<Task> {
      * 填报超时的数目
      * **/
     Integer selectAuDateOrEnDateCounts(@Param("param") QueryTaskParam param,@Param("auditEndDate") Date auditEndDate,@Param("endDate") Date endDate);
-    /**
-     * 查询审核过的数目
-     * **/
-    Integer selectAuditCount(QueryTaskParam param);
+
 
 }

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

@@ -761,9 +761,7 @@ public class TaskServiceImpl implements TaskService {
         }
         TaskAnalysisResult taskStateCounts = new TaskAnalysisResult();
 
-        //查出审核过的数目--大于APPLY_STATE_AUDITING就是审核过了
-        param.setStatus(Constants.APPLY_STATE_AUDITING);
-        Integer auditCount= this.taskMapper.selectAuditCount(param);
+
         //查出审核超时的数目
         param.setStatus(Constants.APPLY_STATE_AUDITING);
         Integer auditTimeoutCount =this.taskMapper.selectAuDateOrEnDateCounts(param,date,null);
@@ -771,7 +769,6 @@ public class TaskServiceImpl implements TaskService {
         param.setStatus(Constants.APPLY_STATE_DRAFT);
         Integer addTimeoutCount =this.taskMapper.selectAuDateOrEnDateCounts(param,null,date);
 
-        taskStateCounts.setAuditCount(auditCount);
         taskStateCounts.setAddTimeoutCount(addTimeoutCount);
         taskStateCounts.setAuditTimeoutCount(auditTimeoutCount);
         return taskStateCounts;

src/main/resources/mybatis/mapping/TaskMapper.xml

@@ -131,21 +131,6 @@
         </if>
     </select>
 
-    <select id="selectAuditCount" resultType="java.lang.Integer">
-        select count(id)  from data_enter_task
-        where state = 1
-        <if test="ruleLevel != null and ruleLevel !=''">
-            and rule_level = #{ruleLevel}
-        </if>
-
-        <if test="status != null and status !=''">
-            and status > #{status}
-        </if>
-
-        <if test="keyword != null and keyword !=''">
-            and rule_name like concat('%', #{keyword}, '%')
-        </if>
 
-    </select>
 
 </mapper>
\ No newline at end of file