优化：设备列表ES搜索条件

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

@@ -431,31 +431,36 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             }
         }
 
-        // 默认条件【STATUS===""】
+        // 默认条件【STATUS==="" || null】
         BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
-        meBuilder.must(QueryBuilders.matchQuery("STATUS", "null"));
+        meBuilder.must(QueryBuilders.boolQuery()
+                .should(QueryBuilders.boolQuery().mustNot(QueryBuilders.existsQuery("STATUS")))
+                .should(QueryBuilders.boolQuery().must(QueryBuilders.matchPhraseQuery("STATUS",""))));
         boolMust.must(meBuilder);
 
         String queryType = map.getString("QUERY_TYPE");
-        // //查询 安装告知【可告知设备列表】【EQU_STATE===""】
+        // //查询 安装告知【可告知设备列表】【EQU_STATE=== null】
         if (!ObjectUtils.isEmpty(queryType) && ValidationUtil.equals(queryType, "AZ")) {
             BoolQueryBuilder azBuilder = QueryBuilders.boolQuery();
-            azBuilder.must(QueryBuilders.matchQuery("EQU_STATE", 9999));
+            azBuilder.mustNot(QueryBuilders.existsQuery("EQU_STATE"));
             boolMust.must(azBuilder);
         }
-        //查询 维保备案【可绑定设备列表】【EQU_STATE==="" && INSPECT_REPORT！==9999(默认占位值)】
+        //查询 维保备案【可绑定设备列表】【(EQU_STATE=== null） && (INSPECT_REPORT！==""  && !null)】
         if (!ObjectUtils.isEmpty(queryType) && ValidationUtil.equals(queryType, "WB")) {
             BoolQueryBuilder wbBuilder = QueryBuilders.boolQuery();
-            wbBuilder.must(QueryBuilders.matchQuery("EQU_STATE", 9999));
-            wbBuilder.mustNot(QueryBuilders.existsQuery("INSPECT_REPORT"));
+            wbBuilder.mustNot(QueryBuilders.existsQuery("EQU_STATE"));
+            wbBuilder.must(QueryBuilders.existsQuery("INSPECT_REPORT"));
+            wbBuilder.mustNot(QueryBuilders.matchPhraseQuery("INSPECT_REPORT",""));
             boolMust.must(wbBuilder);
         }
-        //查询 使用登记【可选设备列表】【EQU_STATUS==="" && INSPECT_REPORT！==9999(默认占位值) && USE_ORG_CODE!=="" 】
+        //查询 使用登记【可选设备列表】【EQU_STATUS=== null && (INSPECT_REPORT！=="" && !null) && (USE_ORG_CODE!=="" && !null)】
         if (!ObjectUtils.isEmpty(queryType) && ValidationUtil.equals(queryType, "SY")) {
             BoolQueryBuilder syBuilder = QueryBuilders.boolQuery();
-            syBuilder.must(QueryBuilders.matchQuery("EQU_STATE", 9999));
-            syBuilder.mustNot(QueryBuilders.existsQuery("INSPECT_REPORT"));
-            syBuilder.mustNot(QueryBuilders.existsQuery("USE_ORG_CODE"));
+            syBuilder.mustNot(QueryBuilders.existsQuery("EQU_STATE"));
+            syBuilder.must(QueryBuilders.existsQuery("INSPECT_REPORT"));
+            syBuilder.mustNot(QueryBuilders.matchPhraseQuery("INSPECT_REPORT",""));
+            syBuilder.must(QueryBuilders.existsQuery("USE_ORG_CODE"));
+            syBuilder.mustNot(QueryBuilders.matchPhraseQuery("USE_ORG_CODE",""));
             boolMust.must(syBuilder);
         }
 
@@ -638,9 +643,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         Map<String, Object> map = categoryOtherInfoMapper.selectDataById(id);
         categoryOtherInfoMapper.updateEsStatus(id);
         ESEquipmentCategoryDto dto = JSON.parseObject(toJSONString(map), ESEquipmentCategoryDto.class);
-        // 默认赋值占位，方便es条件搜索时使用
-        dto.setSTATUS("null");
-        dto.setEQU_STATE(9999);
         Optional<ESEquipmentCategoryDto> data = esEquipmentCategory.findById(id);
         if (!ObjectUtils.isEmpty(data)) {
             esEquipmentCategory.deleteById(id);