refeat(jyjc): 报检规则4.0开发

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java

@@ -1498,7 +1498,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         setFilterByIndefinite(map, type, companyCode, boolMust);
         // 设备种类编码
         if (!ObjectUtils.isEmpty(map.getString("EQU_LIST_CODE"))) {
-            boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE", QueryParser.escape(map.getString("EQU_LIST_CODE"))));
+            boolMust.must(QueryBuilders.termQuery("EQU_LIST_CODE", QueryParser.escape(map.getString("EQU_LIST_CODE"))));
         }
         // 设备类别
         if (!ObjectUtils.isEmpty(map.getString("EQU_CATEGORY_CODE"))) {
@@ -1530,7 +1530,14 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         }
         // 大型游乐设施时按照设备分类过滤
         if (!ObjectUtils.isEmpty(map.getString("equipTag1")) && EquipmentClassifityEnum.YLSS.getCode().equals(map.getString("EQU_LIST_CODE"))) {
-            boolMust.must(QueryBuilders.termQuery("tag1.keyword", QueryParser.escape(map.getString("equipTag1"))));
+            // 筛选时取本级及空的
+            String equipTag1 = map.getString("equipTag1");
+            BoolQueryBuilder orBuilder = QueryBuilders.boolQuery();
+            orBuilder.should(QueryBuilders.termQuery("tag1.keyword", equipTag1));
+            orBuilder.should(QueryBuilders.boolQuery().mustNot(QueryBuilders.existsQuery("tag1")));
+            orBuilder.should(QueryBuilders.boolQuery().must(QueryBuilders.matchPhraseQuery("tag1", "")));
+            orBuilder.minimumShouldMatch(1);
+            boolMust.must(orBuilder);
         }
         // 固定式压力容器按照是否球罐过滤
         if (!ObjectUtils.isEmpty(map.getString("equipTag1")) && BizCommonConstant.EQU_CATEGORY_CODE_GDYLRQ.equals(map.getString("EQU_CATEGORY_CODE"))) {