APP端驾驶舱 问题整改新增逾期整改

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/board/dto/app/AppSyntheticQuestionDto.java

@@ -15,6 +15,8 @@ public class AppSyntheticQuestionDto {
     private int waitReformCount;
     @ApiModelProperty("已整改")
     private int reformedCount;
+    @ApiModelProperty("逾期整改")
+    private int overReformedCount;
     @ApiModelProperty("履职隐患数")
     private int resumptionCount;
     @ApiModelProperty("履职已整改")

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/board/service/impl/AppCockpitServiceImpl.java

@@ -377,7 +377,8 @@ public class AppCockpitServiceImpl implements AppCockpitService {
         vo.getRateByState().put("待整改", (float) questionDto.getWaitReformCount());
         vo.getRateByState().put("已逾期", (float) questionDto.getOverdueCount());
         vo.getRateByState().put("已整改", (float) questionDto.getReformedCount());
-        vo.getRateByState().put("整改率", NumberUtils.computeRate(questionDto.getConfirmedCount(), questionDto.getReformedCount()));
+        vo.getRateByState().put("逾期整改", (float) questionDto.getOverReformedCount());
+        vo.getRateByState().put("整改率", NumberUtils.computeRate(questionDto.getConfirmedCount(), questionDto.getReformedCount()+questionDto.getOverReformedCount()));
 
         vo.getResumption().put("隐患数", (float) questionDto.getResumptionCount());
         vo.getResumption().put("已整改", (float) questionDto.getResumptionReformedCount());

soc-modules/soc-modules-core/src/main/resources/mapper/board/AppCockpitMapper.xml

@@ -248,6 +248,9 @@
                            (q.reform_status = 11, 1, 0))                                 AS reformedCount,
                sum(
                        IF
+                           (q.reform_status = 13, 1, 0))                                 AS overReformedCount,
+               sum(
+                       IF
                            (q.src_type = 1 AND (q.src_task_type = 1 or q.src_task_type = 2 or q.src_task_type = 3), 1,
                             0))                                                          AS resumptionCount,
                sum(