驾驶舱问题整改比例计算调整

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

@@ -261,7 +261,7 @@ public class CockpitServiceImpl implements CockpitService {
         vo.setUnconfirm(NumberUtils.computeRate(questionDto.getTotal(), questionDto.getUnconfirmedCount()));
         vo.setDissent(NumberUtils.computeRate(questionDto.getTotal(), questionDto.getDissentCount()));
         vo.setClosed(NumberUtils.computeRate(questionDto.getTotal(), questionDto.getClosedCount()));
-        vo.setUnreform(NumberUtils.computeRate(questionDto.getTotal(), questionDto.getUnconfirmedCount()));
+        vo.setUnreform(NumberUtils.computeRate(questionDto.getTotal(), questionDto.getWaitReformCount()));
         vo.setReformed(NumberUtils.computeRate(questionDto.getTotal(), questionDto.getReformedCount()));
         vo.setOverdue(NumberUtils.computeRate(questionDto.getTotal(), questionDto.getOverdueCount()));
 //        if (overdueCount.size() == 2) {

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

@@ -236,8 +236,8 @@
     <select id="selectSyntheticQuestion" resultType="com.xunmei.core.board.dto.app.AppSyntheticQuestionDto">
         SELECT sum(
                        IF
-                           (q.confirm_status >= 2, 1, 0))                                AS confirmedCount,
-               sum(qf.count)                                                             AS dissentCount,
+                           (q.confirm_status >= 2 and q.reform_status is not null, 1, 0))    AS confirmedCount,
+               sum(if(q.confirm_status = 1, 1, 0))                                       AS dissentCount,
                sum(
                        IF
                            (q.confirm_status = 3 AND q.reform_status IS NULL, 1, 0))     AS cancelCount,
@@ -274,11 +274,6 @@
                            (q.confirm_status >= 2 AND q.src_type = 2, 1, 0))             AS safetyCheckConfirmedCount,
                sum(if(q.confirm_status != 3 and q.reform_deadline &lt;= #{today}, 1, 0)) as overdueCount
         FROM core_question q
-                 LEFT JOIN (SELECT question_id, count(0) AS count
-                            FROM core_question_flow
-                            WHERE execute_step = 1
-                              AND execute_status = 1
-                            GROUP BY question_id) qf ON q.id = qf.question_id
         WHERE ((
                            #{startDate}   <![CDATA[<=]]> q.submit_time
                        and #{endDate} >= q.submit_time

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

@@ -145,10 +145,10 @@
     </select>
     <select id="orgGA38" resultType="com.xunmei.core.board.dto.web.WebGA38InfoDto">
         SELECT o.path,
-               if(m.ga382021 is null or m.ga382021=0, 0, 1)        as ga382021,
-               if(m.ga382021current is null or m.ga382021current=0, 0, 1) as ga382021current,
-               if(m.ga382015 is null or m.ga382015=0, 0, 1)        as ga382015,
-               if(m.ga382015current is null or m.ga382015current=0, 0, 1) as ga382015current
+               if(m.ga382021 is null or m.ga382021 = 0, 0, 1)               as ga382021,
+               if(m.ga382021current is null or m.ga382021current = 0, 0, 1) as ga382021current,
+               if(m.ga382015 is null or m.ga382015 = 0, 0, 1)               as ga382015,
+               if(m.ga382015current is null or m.ga382015current = 0, 0, 1) as ga382015current
         from sys_org o
                  LEFT JOIN (SELECT org_id,
                                    sum(standard = 1)                                             AS ga382021,
@@ -214,10 +214,10 @@
                sum(
                        IF
                            (q.confirm_status = 0, 1, 0))                                 AS unconfirmedCount,
-               sum(qf.count)                                                             AS dissentCount,
+               sum(IF(q.confirm_status = 1, 1, 0))                                       AS dissentCount,
                sum(
                        IF
-                           (q.confirm_status = 3, 1, 0))                                 AS closedCount,
+                           (q.confirm_status = 3 AND q.reform_status IS NULL, 1, 0)) AS closedCount,
                sum(
                        IF
                            (q.confirm_status = 2, 1, 0))                                 AS waitReformCount,
@@ -226,11 +226,6 @@
                            (q.reform_status = 11, 1, 0))                                 AS reformedCount,
                sum(if(q.confirm_status != 3 and q.reform_deadline &lt;= #{today}, 1, 0)) as overdueCount
         FROM core_question q
-                 LEFT JOIN (SELECT question_id, count(0) AS count
-                            FROM core_question_flow
-                            WHERE execute_step = 1
-                              AND execute_status = 1
-                            GROUP BY question_id) qf ON q.id = qf.question_id
         WHERE ((
                            #{startDate}   <![CDATA[<=]]> q.submit_time
                        and #{endDate} >= q.submit_time