修改大屏综合统计-设备一类二类三类统计数据只查询非气瓶和压力管道的数据

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ComprehensiveStatisticalAnalysisServiceImpl.java

@@ -3684,7 +3684,13 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
             getStatisticCountByGroup(request, scoreBuilder, scoreQuery, "DATA_QUALITY_SCORE", scoreCountByGroup, "scoreCount");
             if (!code.startsWith("8")) {
                 for (String key : scoreCountByGroup.keySet()) {
-                    Long classCount = "1".equals(key) ? oneClassCount += (Long) scoreCountByGroup.get(key) : ("2".equals(key) ? (twoClassCount += (Long) scoreCountByGroup.get(key)) : (threeClassCount += (Long) scoreCountByGroup.get(key)));
+                    if ("1".equals(key)) {
+                        oneClassCount += (Long) scoreCountByGroup.get(key);
+                    } else if ("2".equals(key)) {
+                        twoClassCount += (Long) scoreCountByGroup.get(key);
+                    } else if ("3".equals(key)) {
+                        threeClassCount += (Long) scoreCountByGroup.get(key);
+                    }
                 }
             }
             map.put("DATA_QUALITY_SCORE", scoreCountByGroup);
@@ -3730,9 +3736,6 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
             Map<String, Object> scoreCountByGroup = new HashMap<>();
             getStatisticCountByGroup(request, scoreBuilder, scoreQuery, "DATA_QUALITY_SCORE", scoreCountByGroup, "scoreCount");
             map.put("DATA_QUALITY_SCORE", scoreCountByGroup);
-            for (String key : scoreCountByGroup.keySet()) {
-                Long classCount = "1".equals(key) ? oneClassCount += (Long) scoreCountByGroup.get(key) : ("2".equals(key) ? (twoClassCount += (Long) scoreCountByGroup.get(key)) : (threeClassCount += (Long) scoreCountByGroup.get(key)));
-            }
             // 统计该分类下红黄绿码分别的分组数量 NEXT_INSPECT_DATE
             Map<String, Long> nextInspectCountByGroup = new HashMap<>();
             BoolQueryBuilder nextInspectQuery = QueryBuilderUtils.copyBoolQuery(gasBoolQueryBuilder);
@@ -3760,10 +3763,6 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         // 统计种类/类别/品种数据不对的数据字段
         if (!ObjectUtils.isEmpty(staticCountByGroup)) {
             statisticOtherCount(request, dataMapList, staticCountByGroup, boolMust, groupField, equipCode);
-            Map<String, Long> otherMap = (Map<String, Long>) dataMapList.get(dataMapList.size() - 1).get("DATA_QUALITY_SCORE");
-            oneClassCount += otherMap.containsKey("1") ? otherMap.get("1") : 0L;
-            twoClassCount += otherMap.containsKey("2") ? otherMap.get("2") : 0L;
-            threeClassCount += otherMap.containsKey("3") ? otherMap.get("3") : 0L;
         }
 
         if (!ObjectUtils.isEmpty(equipCode)) {