中心大屏水池相关信息一一对应 bug修改

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

@@ -2209,27 +2209,32 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
 
         // 未开展
         List<HashMap<String, Object>> queryMaps = planTaskMapper.selectPatrolRecordPage(bizOrgCode, date);
-        Map<String, HashMap<String, Object>> hasDataMapInfo = queryMaps.stream().collect(Collectors.toMap(t -> t.get("bizOrgCode").toString(), t -> t));
+        Map<String, List<HashMap<String, Object>>> hasDataMapInfo = queryMaps.stream()
+                .collect(Collectors.groupingBy(
+                        map -> map.get("bizOrgCode").toString()
+                ));
         for (Map<String, Object> station : stations) {
             if (hasDataMapInfo.containsKey(station.get("bizOrgCode").toString())) {
-                HashMap<String, Object> queryMap = hasDataMapInfo.get(station.get("bizOrgCode").toString());
-                if (Integer.parseInt(queryMap.get("finishPointCount").toString()) > 0) {
-                    queryMap.put("patrolStatus", "已开展");
-                } else {
-                    queryMap.put("patrolStatus", "未开展");
+                List<HashMap<String, Object>> queryMapList = hasDataMapInfo.get(station.get("bizOrgCode").toString());
+                for (HashMap<String, Object> queryMap : queryMapList) {
+                    if (Integer.parseInt(queryMap.get("finishPointCount").toString()) > 0) {
+                        queryMap.put("patrolStatus", "已开展");
+                    } else {
+                        queryMap.put("patrolStatus", "未开展");
+                    }
+                    int totalValue = Integer.parseInt(queryMap.getOrDefault("allCount", "0").toString());
+                    int missPointCount = Integer.parseInt(queryMap.getOrDefault("missPointCount", "0").toString());
+                    int finishPointCount = Integer.parseInt(queryMap.getOrDefault("finishPointCount", "0").toString());
+                    // 获取漏检率：missPointCount / totalValue
+                    queryMap.put("missPointRate", getPercent((float) missPointCount, (float) totalValue));
+                    // 执行进度：finishCount / totalValue
+                    queryMap.put("finishRate", getPercent((float) finishPointCount, (float) totalValue));
+                    String realStartTime = queryMap.getOrDefault("realStartTime", cn.hutool.core.date.DateUtil.now()).toString();
+                    String realEndTime = queryMap.getOrDefault("realEndTime", cn.hutool.core.date.DateUtil.now()).toString();
+                    long minutesBetween = this.getMinutesBetween(realStartTime, realEndTime);
+                    queryMap.put("totalTime", minutesBetween);
+                    records.add(queryMap);
                 }
-                int totalValue = Integer.parseInt(queryMap.getOrDefault("allCount", "0").toString());
-                int missPointCount = Integer.parseInt(queryMap.getOrDefault("missPointCount", "0").toString());
-                int finishPointCount = Integer.parseInt(queryMap.getOrDefault("finishPointCount", "0").toString());
-                // 获取漏检率：missPointCount / totalValue
-                queryMap.put("missPointRate", getPercent((float) missPointCount, (float) totalValue));
-                // 执行进度：finishCount / totalValue
-                queryMap.put("finishRate", getPercent((float) finishPointCount, (float) totalValue));
-                String realStartTime = queryMap.getOrDefault("realStartTime", cn.hutool.core.date.DateUtil.now()).toString();
-                String realEndTime = queryMap.getOrDefault("realEndTime", cn.hutool.core.date.DateUtil.now()).toString();
-                long minutesBetween = this.getMinutesBetween(realStartTime, realEndTime);
-                queryMap.put("totalTime", minutesBetween);
-                records.add(queryMap);
             } else {
                 HashMap<String, Object> record = new HashMap<>();
                 record.put("bizOrgCode", station.get("bizOrgCode"));

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

@@ -1787,6 +1787,7 @@
 
 			SELECT LEFT
 				( t.org_code, 18 ) AS bizOrgCode,
+				t.id,
 				u.biz_org_name AS bizOrgName,
 				DATE_FORMAT( t.check_date, '%Y-%m-%d' ) AS time,
 				DATE_FORMAT( t.begin_time, '%Y-%m-%d %H:%i' ) AS beginTime,