隐患问题清单 只有待整改的数据才会逾期

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/dto/QuestionExportDto.java

@@ -95,6 +95,13 @@ public class QuestionExportDto {
     private Integer confirmStatus;
 
     /**
+     * 整改状态
+     */
+
+    @ExcelIgnore
+    private Integer reformStatus;
+
+    /**
      * 确认状态
      */
     @ExcelProperty(value="确认状态",index = 11)

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/service/impl/QuestionServiceImpl.java

@@ -94,7 +94,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         page = baseMapper.pageQuestion(page, query, DateUtil.beginOfDay(new Date()));
         page.getRecords().forEach(r -> {
             if(isOverdue(r)){
-                r.setOverdueStatus(QuestionConfirmEnum.OverDue.getValue());
+                r.setOverdueStatus(QuestionReformEnum.OverDue.getValue());
             }
         });
 //        Page<QuestionPageDto> r =page.
@@ -141,13 +141,13 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
     }
 
     private boolean isOverdue(Question q){
-        return isOverdue(q.getConfirmStatus(),q.getReformDeadline());
+        return isOverdue(q.getConfirmStatus(),q.getReformStatus(),q.getReformDeadline());
     }
 
-    private boolean isOverdue(Integer confirmStatus,Date reformDeadLine){
-        if (ObjectUtil.notEqual(confirmStatus, QuestionConfirmEnum.Closed.getValue()) &&
-                reformDeadLine.before(DateUtil.beginOfDay(new Date()))) {
-            //任务未结束并且过了整改结束日期
+    private boolean isOverdue(Integer confirmStatus,Integer reformStatus,Date reformDeadLine){
+        if (ObjectUtil.equal(reformStatus, QuestionReformEnum.Unreform.getValue()) &&
+            reformDeadLine.before(DateUtil.beginOfDay(new Date()))) {
+            //任务未结束、任务不处于已整改、逾期整改状态 并且过了整改结束日期
             return true;
         }else{
             return  false;
@@ -313,7 +313,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         List<QuestionExportDto> list = baseMapper.selectQuestionExportList(pageDto, DateUtil.beginOfDay(new Date()));
         Integer index = 1;
         for (QuestionExportDto questionExportDto : list) {
-            if(isOverdue(questionExportDto.getConfirmStatus(),questionExportDto.getReformDeadline())){
+            if(isOverdue(questionExportDto.getConfirmStatus(),questionExportDto.getReformStatus(),questionExportDto.getReformDeadline())){
                 questionExportDto.setConfirmStatusText("已逾期");
             }
             questionExportDto.setIndex(index++);

soc-modules/soc-modules-core/src/main/resources/mapper/question/QuestionMapper.xml

@@ -298,15 +298,18 @@
 <!--                and q.confirm_status=#{params.confirmStatus}-->
 <!--            </if>-->
             <if test="params.confirmStatus==12">
-                and (q.confirm_status!=3) and q.reform_deadline &lt; #{today}
+                and q.reform_status=10 and q.reform_deadline &lt; #{today}
             </if>
-            <if test="params.confirmStatus==13">
+            <if test="params.confirmStatus==11 or params.confirmStatus==13">
                 and q.reform_status=#{params.confirmStatus}
             </if>
-            <if test="params.confirmStatus>=10 and params.confirmStatus &lt;12">
-                and q.reform_status=#{params.confirmStatus}
+            <if test="params.confirmStatus==10">
+                and q.reform_status=#{params.confirmStatus} and q.reform_deadline > #{today}
+            </if>
+            <if test="params.confirmStatus &lt; 10 and params.confirmStatus!=3">
+                and q.confirm_status=#{params.confirmStatus}
             </if>
-            <if test="params.confirmStatus &lt; 10">
+            <if test="params.confirmStatus==3">
                 and q.confirm_status=#{params.confirmStatus}
             </if>
         </if>
@@ -335,13 +338,13 @@
                     and q.confirm_status=#{params.status}
                 </when>
                 <when test="params.status==10">
-                    and q.reform_status=#{params.status}
+                    and q.reform_status=#{params.status} and q.reform_deadline > #{today}
                 </when>
                 <when test="params.status==11 or params.status==13">
                     and q.reform_status=#{params.status}
                 </when>
                 <when test="params.status==12">
-                    and (q.confirm_status!=3) and q.reform_status!=11 and q.reform_status!=13  and q.reform_deadline &lt; #{today}
+                    and and q.reform_status=10  and q.reform_deadline &lt; #{today}
                 </when>
                 <otherwise>
                     and q.reform_status=#{params.status}
@@ -450,6 +453,7 @@
         q.submitor_name,
         q.submit_time,
         q.confirm_status,
+        q.reform_status,
         q.reform_deadline,
         case q.src_type when 1 then '确认' else ( case f1.execute_status when 0 then '确认' when 1 then '提出异议' else
         '未确认'
@@ -460,7 +464,7 @@
         f2.executor_name as dissenterName,
         f2.description as dissentDesc,
         f3.reform_date as reformDate,
-        case q.reform_status when 10 then '未整改' when 11 then '已整改' else '' end as reformStatusText,
+        case q.reform_status when 10 then '未整改' when 11 then '已整改' when 13 then '逾期整改' else '' end as reformStatusText,
         f3.description as reformDesc,
         o.affiliated_area,
         o.affiliated_bank