Merge remote-tracking branch 'origin/V0.1.1_alarm' into V0.1.1_alarm

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

@@ -123,6 +123,15 @@ public class QuestionReformServiceImpl extends ServiceImpl<QuestionMapper, Quest
             return  false;
         }
     }
+    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;
+        }
+    }
 
     /**
      * 整改
@@ -198,7 +207,7 @@ public class QuestionReformServiceImpl extends ServiceImpl<QuestionMapper, Quest
         Integer index = 1;
         for (QuestionExportDto questionExportDto : list) {
             questionExportDto.setIndex(index++);
-           if (isOverdue(questionExportDto.getConfirmStatus(),questionExportDto.getReformDeadline())) {
+           if (isOverdue(questionExportDto.getConfirmStatus(),questionExportDto.getReformStatus(),questionExportDto.getReformDeadline())) {
                 //任务未结束并且过了整改结束日期
                 questionExportDto.setReformStatusText("已逾期");
             }

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

@@ -532,6 +532,7 @@
         f2.executor_name as dissenterName,
         f2.description as dissentDesc,
         f3.reform_date as reformDate,
+        q.reform_status,
         case q.reform_status when 10 then '待整改' when 11 then '已整改'  when 12 then '已逾期' when 13 then '逾期整改' else '' end as reformStatusText,
         f3.description as reformDesc,
         o.affiliated_area,