fix(jg):大屏查询ES查询撬装和气瓶添加设备类别条件

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

@@ -2268,19 +2268,23 @@ public class JGDPStatisticsServiceImpl {
             boolMust.must(pBuilder);
         }
         // 是否车用气瓶
+        if (CylinderTypeEnum.CYLINDER.getCode().equals(map.getString(EQU_CATEGORY_CODE))) {
             if (!ObjectUtils.isEmpty(map.getString(WHETHER_VEHICLE_CYLINDER))) {
                 BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
                 String test = QueryParser.escape(map.getString(WHETHER_VEHICLE_CYLINDER));
                 pBuilder.must(QueryBuilders.termQuery(WHETHER_VEHICLE_CYLINDER, test));
                 boolMust.must(pBuilder);
             }
+        }
         // 是否撬装式压力容器
+        if ("2100".equals(map.getString(EQU_CATEGORY_CODE))){
             if (!ObjectUtils.isEmpty(map.getString(WHETHER_SKID_MOUNTED_PRESSURE_VESSEL))) {
                 BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
                 String test = QueryParser.escape(map.getString(WHETHER_SKID_MOUNTED_PRESSURE_VESSEL));
                 pBuilder.must(QueryBuilders.termQuery(WHETHER_SKID_MOUNTED_PRESSURE_VESSEL, test));
                 boolMust.must(pBuilder);
             }
+        }
         // 设备代码模糊查询
         if (!ObjectUtils.isEmpty(map.getString(EQU_CODE))) {
             BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();