解决缺陷 预案演练 统计未包含 已完成状态

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

@@ -210,7 +210,7 @@
     <!--    </select>-->
     <select id="selectSyntheticDrill" resultType="com.xunmei.core.board.dto.app.AppSyntheticTaskCategoryDto">
         SELECT count(0)          AS total,
-               sum(r.STATUS = 3) AS completed
+               sum(r.STATUS in (2,3)) AS completed
         FROM core_drill_task r
         WHERE (
                    #{startDate}    <![CDATA[<=]]> r.end_date

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

@@ -90,7 +90,8 @@
         org_id,
         org_path,
         count( 0 ) AS task_total,
-        SUM( CASE `status` WHEN 3 THEN 1 ELSE 0 END ) AS completed_count
+        ifnull(SUM(status in (2,3)),0) AS completed_count
+<!--        SUM( CASE `status` WHEN 3 THEN 1 ELSE 0 END ) AS completed_count-->
         FROM
         core_drill_task r
         <!--                INNER  join ( SELECT id,path FROM sys_org WHERE path LIKE CONCAT(( SELECT path FROM sys_org WHERE id =#{orgId}), '%' ) AND deleted = 0 ) o on r.org_Id=o.id-->

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysOrgMapper.xml

@@ -1159,7 +1159,7 @@ and
               --  LEFT JOIN core_drill_plan b ON a.plan_id = b.id
             LEFT JOIN sys_org c ON a.org_id = c.id
         WHERE c.type=3
-          AND a.`status`=2
+          AND a.`status`in (2,3)
           and a.org_path    like concat(concat('%',#{orgPath}),'%')
           AND a.drill_start_time BETWEEN #{startTime} and #{endTime}
     </select>
@@ -1181,7 +1181,7 @@ and
             core_drill_task a
                 LEFT JOIN core_drill_plan b ON a.plan_id = b.id
         WHERE b.exec_org_type=4
-          and a.`status`=2
+          and a.`status` in (2,3)
           and a.org_path    like concat(concat('%',#{orgPath}),'%')
           AND a.drill_start_time BETWEEN #{startTime} and #{endTime}
     </select>
@@ -1194,6 +1194,7 @@ and
                 LEFT JOIN core_drill_task_to_user c ON c.drill_task_id = a.id
         WHERE
             b.exec_org_type = 4
+          and a.`status` in (2,3)
           and a.org_path    like concat(concat('%',#{orgPath}),'%')
           AND a.drill_start_time BETWEEN #{startTime} and #{endTime}
     </select>