填在隐患问题和 问题整改时间查询逻辑，取交集， APP 驾驶舱 隐患问题执行问题整改相关数据

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

@@ -371,14 +371,14 @@ public class AppCockpitServiceImpl implements AppCockpitService {
         }
 //        int overdueCount = appCockpitMapper.selectOverDueQuestionCount(org.getPath(), range.getStartTime(), range.getEndTime());
         AppSyntheticQuestionVo vo = new AppSyntheticQuestionVo();
-        vo.getRateByState().put("已确认", (float) questionDto.getConfirmedCount());
-        vo.getRateByState().put("有异议", (float) questionDto.getDissentCount());
-        vo.getRateByState().put("已关闭", (float) questionDto.getCancelCount());
+//        vo.getRateByState().put("已确认", (float) questionDto.getConfirmedCount());
+//        vo.getRateByState().put("有异议", (float) questionDto.getDissentCount());
+//        vo.getRateByState().put("已关闭", (float) questionDto.getCancelCount());
         vo.getRateByState().put("待整改", (float) questionDto.getWaitReformCount());
         vo.getRateByState().put("已逾期", (float) questionDto.getOverdueCount());
         vo.getRateByState().put("已整改", (float) questionDto.getReformedCount());
         vo.getRateByState().put("逾期整改", (float) questionDto.getOverReformedCount());
-        vo.getRateByState().put("整改率", NumberUtils.computeRate(questionDto.getConfirmedCount(), questionDto.getReformedCount()+questionDto.getOverReformedCount()));
+        vo.getRateByState().put("整改率", NumberUtils.computeRate(questionDto.getConfirmedCount(), questionDto.getReformedCount()));
 
         vo.getResumption().put("隐患数", (float) questionDto.getResumptionCount());
         vo.getResumption().put("已整改", (float) questionDto.getResumptionReformedCount());
@@ -388,12 +388,12 @@ public class AppCockpitServiceImpl implements AppCockpitService {
         vo.getOffATMCheck().put("已整改", (float) questionDto.getOffATMResumptionReformedCount());
         vo.getOffATMCheck().put("整改率", NumberUtils.computeRate(questionDto.getOffATMResumptionCount(), questionDto.getOffATMResumptionReformedCount()));
 
-        vo.getSafetyCheck().put("隐患数", (float) questionDto.getSafetyCheckCount());
-        vo.getSafetyCheck().put("有异议", (float) questionDto.getDissentCount());
-        vo.getSafetyCheck().put("已取消", (float) questionDto.getCancelCount());
-        vo.getSafetyCheck().put("已确认", (float) questionDto.getSafetyCheckConfirmedCount());
+        vo.getSafetyCheck().put("隐患数", (float) questionDto.getSafetyCheckConfirmedCount());
         vo.getSafetyCheck().put("已整改", (float) questionDto.getSafetyCheckReformCount());
         vo.getSafetyCheck().put("整改率", NumberUtils.computeRate(questionDto.getSafetyCheckConfirmedCount(), questionDto.getSafetyCheckReformCount()));
+        vo.getSafetyCheck().put("问题数", (float) questionDto.getSafetyCheckCount());
+        vo.getSafetyCheck().put("有异议", (float) questionDto.getDissentCount());
+        vo.getSafetyCheck().put("已取消", (float) questionDto.getCancelCount());
 
         return vo;
 

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

@@ -242,7 +242,7 @@
                            (q.confirm_status = 3 AND q.reform_status IS NULL, 1, 0))     AS cancelCount,
                sum(
                        IF
-                           (q.confirm_status = 2, 1, 0))                                 AS waitReformCount,
+                           (q.reform_status = 10 AND q.reform_deadline > #{today}, 1, 0))                                 AS waitReformCount,
                sum(
                        IF
                            (q.reform_status = 11, 1, 0))                                 AS reformedCount,
@@ -274,7 +274,7 @@
                sum(
                        IF
                            (q.confirm_status >= 2 AND q.src_type = 2, 1, 0))             AS safetyCheckConfirmedCount,
-               sum(if(q.confirm_status != 3 and q.reform_deadline <= #{today}, 1, 0)) as overdueCount
+               sum(if(q.reform_status = 10 and q.reform_deadline <= #{today}, 1, 0)) as overdueCount
         FROM core_question q
         WHERE ((
                            #{startDate}   <![CDATA[<=]]> q.submit_time

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

@@ -314,7 +314,19 @@
             </if>
         </if>
         <if test="params.submitRange!=null and params.submitRange.length==2">
-            and q.submit_time between #{params.submitRange[0]} and #{params.submitRange[1]}
+<!--            and q.submit_time between #{params.submitRange[0]} and #{params.submitRange[1]}-->
+            and ((
+            #{params.submitRange[0]}   <![CDATA[<=]]> q.submit_time
+            and #{params.submitRange[1]} >= q.submit_time
+            )
+            or (
+            #{params.submitRange[0]}    <![CDATA[<=]]> q.reform_deadline
+            and #{params.submitRange[1]} >= q.reform_deadline
+            )
+            or (
+            #{params.submitRange[0]} >= q.submit_time
+            and #{params.submitRange[1]}  <![CDATA[<=]]> q.reform_deadline
+            ))
         </if>
         <if test="params.searchKey!=null">
             and (q.question_desc like concat('%',#{params.searchKey},'%') or q.check_content like
@@ -412,7 +424,19 @@
 <!--            </if>-->
         </if>
         <if test="params.reformRange!=null and params.reformRange.length==2">
-            and q.reform_deadline between #{params.reformRange[0]} and #{params.reformRange[1]}
+<!--            and q.reform_deadline between #{params.reformRange[0]} and #{params.reformRange[1]}-->
+            and ((
+            #{params.reformRange[0]}   <![CDATA[<=]]> q.submit_time
+            and #{params.reformRange[1]} >= q.submit_time
+            )
+            or (
+            #{params.reformRange[0]}    <![CDATA[<=]]> q.reform_deadline
+            and #{params.reformRange[1]} >= q.reform_deadline
+            )
+            or (
+            #{params.reformRange[0]} >= q.submit_time
+            and #{params.reformRange[1]}  <![CDATA[<=]]> q.reform_deadline
+            ))
         </if>
         <if test="params.searchKey!=null">
             and (q.question_desc like concat('%',#{params.searchKey},'%') or q.check_content like