增加下发时间筛选。修改为下发时间倒叙

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

@@ -38,6 +38,24 @@ public class QueryTaskParam {
     @ApiModelProperty("每页条数")
     private int pageSize = 10;
 
+    @ApiModelProperty("辨别查询填报超时还是审核超时")
+    private Integer states= 0;
+
+    @ApiModelProperty("下发开始时间")
+    private String createTimeFrom;
+
+    @ApiModelProperty("下发结束时间")
+    private String createTimeTo;
+
+    @ApiModelProperty("审核期限开始时间")
+    private String auditEndDateFrom;
+    @ApiModelProperty("审核期限结束时间")
+    private String auditEndDateTo;
+    @ApiModelProperty("填报期限开始时间")
+    private String endDateFrom;
+    @ApiModelProperty("填报期限结束时间")
+    private String endDateTo;
+
     /**
      * 开始数
      */

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

@@ -24,9 +24,9 @@ public class TaskAnalysisResult {
 
 
     @ApiModelProperty("填报超时数")
-    private Integer addTimeoutCount;
+    private int addTimeoutCount;
     @ApiModelProperty("审核超时数")
-    private Integer auditTimeoutCount;
+    private int auditTimeoutCount;
 
 //    @ApiModelProperty("被驳回总数")
 //    private int rejectCount;

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

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

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

@@ -763,11 +763,11 @@ public class TaskServiceImpl implements TaskService {
 
 
         //查出审核超时的数目
-        param.setStatus(Constants.APPLY_STATE_AUDITING);
-        Integer auditTimeoutCount =this.taskMapper.selectAuDateOrEnDateCounts(param,date,null);
+        param.setStates(Constants.APPLY_STATE_AUDITING);
+        Integer auditTimeoutCount =this.taskMapper.selectAuDateOrEnDateCounts(param);
          //查出填报超时的数目
-        param.setStatus(Constants.APPLY_STATE_DRAFT);
-        Integer addTimeoutCount =this.taskMapper.selectAuDateOrEnDateCounts(param,null,date);
+        param.setStates(Constants.APPLY_STATE_DRAFT);
+        Integer addTimeoutCount =this.taskMapper.selectAuDateOrEnDateCounts(param);
 
         taskStateCounts.setAddTimeoutCount(addTimeoutCount);
         taskStateCounts.setAuditTimeoutCount(auditTimeoutCount);

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

@@ -38,7 +38,7 @@
         select *
         from data_enter_task
         <include refid="findTaskWhereSql"></include>
-        order by status asc, value_time desc
+        order by create_time desc,status asc  /*value_time desc*/
         limit #{start}, #{pageSize}
     </select>
 
@@ -86,6 +86,28 @@
         <if test="status != null ">
             and status = #{status}
         </if>
+
+        <if test="createTimeFrom !=null and createTimeFrom !=''">
+            and create_time >= #{createTimeFrom}
+        </if>
+
+        <if test="createTimeTo !=null and createTimeTo !=''">
+            and create_time &lt; #{createTimeTo}
+        </if>
+
+        <if test="auditEndDateFrom != null and auditEndDateFrom !=''">
+            and audit_end_date >= #{auditEndDateFrom}
+        </if>
+        <if test="auditEndDateTo != null and auditEndDateTo !=''">
+            and audit_end_date  &lt; #{auditEndDateTo}
+        </if>
+
+        <if test="endDateFrom != null and endDateFrom!=''">
+            and end_date >= #{endDateFrom}
+        </if>
+        <if test="endDateTo != null and endDateTo!=''">
+            and end_date &lt; #{endDateTo}
+        </if>
     </sql>
 
 
@@ -109,25 +131,20 @@
         group by status
     </select>
 
-    <select id="selectAuDateOrEnDateCounts" resultType="java.lang.Integer">
+    <select id="selectAuDateOrEnDateCounts" resultType="java.lang.Integer"
+            parameterType="com.keymobile.indicators.model.entity.dataenter.QueryAllTaskParam">
         select count(id)  from data_enter_task
-        where state = 1
-        <if test="param.ruleLevel != null and param.ruleLevel !=''">
-            and rule_level = #{param.ruleLevel}
-        </if>
-
-        <if test="param.status != null and param.status !=''">
-            and status = #{param.status}
-        </if>
-
-        <if test="param.keyword != null and param.keyword !=''">
-            and rule_name like concat('%', #{param.keyword}, '%')
-        </if>
-        <if test="endDate != null">
-            and end_date &lt; #{endDate}
-        </if>
-        <if test="auditEndDate != null">
-            and audit_end_date &lt; #{auditEndDate}
+        <include refid="findTaskWhereSql"></include>
+        <if test="states != null and states != 0">
+        and status = #{states}
+        <choose>
+        <when test="states == 1">
+            and end_date &lt; curdate()
+        </when>
+        <when test=" states == 2 ">
+            and audit_end_date &lt; curdate()
+        </when>
+        </choose>
         </if>
     </select>