巡检统计数据错误

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java

@@ -2175,23 +2175,19 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
         List<Map<String, Object>> stations = response.getResult();
         AtomicInteger doneNum = new AtomicInteger();  // 已开展
         AtomicInteger missNum = new AtomicInteger();  // 有漏检
-        AtomicInteger noMissNum = new AtomicInteger();  // 无漏检
         List<Map<String, String>> queryMaps = planTaskMapper.selectPatrolActivityStats(bizOrgCode, date);
         for (Map<String, String> queryMap : queryMaps) {
             String missStatus = queryMap.get("missStatus");
             if (Objects.equals(missStatus, "有漏检")) {
                 missNum.incrementAndGet();
             }
-            if (Objects.equals(missStatus, "无漏检")) {
-                noMissNum.incrementAndGet();
-            }
             doneNum.incrementAndGet();
         }
         return new HashMap<String, Number>() {{
             this.put("done", doneNum.intValue());
             this.put("undone", stations.size() - doneNum.intValue());
             this.put("miss", missNum);
-            this.put("noMiss", noMissNum);
+            this.put("noMiss", stations.size() - missNum.intValue());
         }};
     }
 

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -1845,7 +1845,7 @@
 	<select id="selectPatrolActivityStats" resultType="Map">
 		SELECT
 			LEFT(t.org_code, 18) AS bizOrgCode,
-			IF(SUM(IF(t.finish_status = 3, t.point_num, 0)) > 0, '有漏检', '无漏检') AS missStatus
+			( SELECT IF(COUNT(1)> 0, '有漏检', '无漏检') FROM p_plan_task_detail d WHERE d.is_finish != 1 AND FIND_IN_SET(d.task_no,GROUP_CONCAT(t.id)) > 0 ) AS missStatus
 		FROM
 			p_plan_task t
 			<where>