处理一码通管辖机构、监管码、使用登记证编号查询问题

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/dto/ESEquipmentCategoryDto.java

@@ -42,7 +42,7 @@ public class ESEquipmentCategoryDto {
     @Field(type = FieldType.Text)
     private String EQU_CATEGORY;
 
-    @Field(type = FieldType.Text)
+    @Field(type = FieldType.Keyword)
     private String USE_ORG_CODE;
 
     @Field(type = FieldType.Text)
@@ -51,7 +51,7 @@ public class ESEquipmentCategoryDto {
     @Field(type = FieldType.Text)
     private String EQU_CODE;
 
-    @Field(type = FieldType.Text)
+    @Field(type = FieldType.Keyword)
     private String SUPERVISORY_CODE;
 
     @Field(type = FieldType.Text)

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

@@ -2011,15 +2011,6 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         String code = object.getString("orgCode");
         String companyCode = object.getString("companyCode").contains("_") ?
                 object.getString("companyCode").split("_")[1] : object.getString("companyCode");
-        if (!ValidationUtil.isEmpty(level)) {
-            if (LEVEL.equals(level)) {
-                //企业
-                map.put("USE_UNIT_CREDIT_CODE", companyCode);
-            } else {
-                //监管单位
-                map.put("ORG_BRANCH_CODE", code);
-            }
-        }
         Page<JSONObject> result = new Page<>(map.getInteger("number"), map.getInteger("size"));
         SearchRequest request = new SearchRequest();
         request.indices("idx_biz_view_jg_all");
@@ -2027,6 +2018,34 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         builder.trackTotalHits(true);
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
         //通用匹配规则，条件构建
+        // 根据当前登录用户类型及管辖机构筛选条件添加对应参数
+        if (!ValidationUtil.isEmpty(level)) {
+            if (LEVEL.equals(level)) {
+                //企业
+                map.put("USE_UNIT_CREDIT_CODE", companyCode);
+                if (!ObjectUtils.isEmpty(map.getString("ORG_BRANCH_CODE"))) {
+                    BoolQueryBuilder query = QueryBuilders.boolQuery();
+                    String test = QueryParser.escape(map.getString("ORG_BRANCH_CODE"));
+                    query.must(QueryBuilders.matchPhrasePrefixQuery("ORG_BRANCH_CODE", test));
+                    boolMust.must(query);
+                }
+            } else {
+                if (!ObjectUtils.isEmpty(map.getString("ORG_BRANCH_CODE"))) {
+                    String paramCode = map.getString("ORG_BRANCH_CODE");
+                    if (paramCode.contains(code)) {
+                        BoolQueryBuilder query = QueryBuilders.boolQuery();
+                        String test = QueryParser.escape(map.getString("ORG_BRANCH_CODE"));
+                        query.must(QueryBuilders.matchPhrasePrefixQuery("ORG_BRANCH_CODE", test));
+                        boolMust.must(query);
+                    } else {
+                        return result;
+                    }
+                } else {
+                    //监管单位
+                    map.put("ORG_BRANCH_CODE", code);
+                }
+            }
+        }
         //SEQUENCE_NBR
         if (!ObjectUtils.isEmpty(map.getString("SEQUENCE_NBR"))) {
             BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
@@ -2034,18 +2053,6 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
             meBuilder.must(QueryBuilders.matchPhraseQuery("SEQUENCE_NBR", "*" + test + "*"));
             boolMust.must(meBuilder);
         }
-        if (!ObjectUtils.isEmpty(map.getString("ORG_BRANCH_NAME"))) {
-            BoolQueryBuilder query = QueryBuilders.boolQuery();
-            String test = QueryParser.escape(map.getString("ORG_BRANCH_NAME"));
-            query.must(QueryBuilders.matchPhraseQuery("ORG_BRANCH_NAME", "*" + test + "*"));
-            boolMust.must(query);
-        }
-        if (!ObjectUtils.isEmpty(map.getString("ORG_BRANCH_CODE"))) {
-            BoolQueryBuilder query = QueryBuilders.boolQuery();
-            String test = QueryParser.escape(map.getString("ORG_BRANCH_CODE"));
-            query.must(QueryBuilders.matchPhrasePrefixQuery("ORG_BRANCH_CODE", test));
-            boolMust.must(query);
-        }
         if (!ObjectUtils.isEmpty(map.getString("USE_UNIT_NAME"))) {
             BoolQueryBuilder query = QueryBuilders.boolQuery();
             String test = QueryParser.escape(map.getString("USE_UNIT_NAME"));
@@ -2079,8 +2086,8 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         }
         if (!ObjectUtils.isEmpty(map.getString("USE_ORG_CODE"))) {
             BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
-            String test = QueryParser.escape(map.getString("USE_ORG_CODE").toLowerCase());
-            meBuilder.must(QueryBuilders.matchPhraseQuery("USE_ORG_CODE", "*" + test + "*"));
+            String test = QueryParser.escape(map.getString("USE_ORG_CODE"));
+            meBuilder.must(QueryBuilders.wildcardQuery("USE_ORG_CODE", "*" + test + "*"));
             boolMust.must(meBuilder);
         }
         if (!ObjectUtils.isEmpty(map.getString("CODE96333"))) {
@@ -2098,8 +2105,8 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
 
         if (!ObjectUtils.isEmpty(map.getString("SUPERVISORY_CODE"))) {
             BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
-//            String test = QueryParser.escape(map.getString("SUPERVISORY_CODE").toLowerCase());
-            meBuilder.must(QueryBuilders.matchPhraseQuery("SUPERVISORY_CODE", "*" + map.getString("SUPERVISORY_CODE").toLowerCase() + "*"));
+            String test = QueryParser.escape(map.getString("SUPERVISORY_CODE"));
+            meBuilder.must(QueryBuilders.wildcardQuery("SUPERVISORY_CODE", "*" + test + "*"));
             boolMust.must(meBuilder);
         }
         if (!ObjectUtils.isEmpty(map.getString("USE_PLACE"))) {