气瓶下钻页面功能-修改

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/CylinderDPStatisticsServiceImpl.java

@@ -521,7 +521,7 @@ public class CylinderDPStatisticsServiceImpl {
             startTime = dpFilterParamForDetailDto.getTimeSearchOne().getBeginDate();
             endTime = dpFilterParamForDetailDto.getTimeSearchOne().getBeginDate();
         }
-        String cylinderVarietyName = CylinderTypeEnum.of(dpFilterParamForDetailDto.getCylinderVariety());
+        String cylinderVarietyName = CylinderTypeEnum.of(dpFilterParamForDetailDto.getTreeValue());
 
         regionModels.forEach(r -> {
             long fillingQuantity = cylinderInfoMapper.queryFillingRecordByOrgCode(r.getRegionCode().toString(), startTime, endTime).stream().map(e->e.getFillingQuantity()).collect(Collectors.toList()).stream().count();
@@ -582,12 +582,21 @@ public class CylinderDPStatisticsServiceImpl {
             boolMust.must(query);
         }
 
-        //匹配气瓶类型（0:正常，1：异常）
-        if (!org.springframework.util.ObjectUtils.isEmpty(dpFilterParamForDetailDto.getCylinderVariety())) {
+        //匹配气瓶类型
+        if (ObjectUtils.isEmpty(dpFilterParamForDetailDto.getTreeValue()) && !CylinderTypeEnum.CYLINDER.getCode().equals(dpFilterParamForDetailDto.getTreeValue())) {
             flag = false;
             BoolQueryBuilder query = QueryBuilders.boolQuery();
-            String cylinderVarietyName = CylinderTypeEnum.of(dpFilterParamForDetailDto.getCylinderVariety());
+            // 是车用气瓶，进行in查询（特种气瓶包含以下三个）
+            if (CylinderTypeEnum.SPECIAL_CYLINDER.getCode().equals(dpFilterParamForDetailDto.getTreeValue())) {
+                Collection<String> collections = new ArrayList<>();
+                collections.add("缠绕气瓶");
+                collections.add("绝热气瓶");
+                collections.add("内装填料气瓶");
+                query.must(QueryBuilders.termsQuery("cylinderVarietyName", collections.toArray()));
+            } else {
+                String cylinderVarietyName = CylinderTypeEnum.of(dpFilterParamForDetailDto.getTreeValue());
                 query.must(QueryBuilders.wildcardQuery("cylinderVarietyName", "*" + cylinderVarietyName + "*"));
+            }
             boolMust.must(query);
         }