fix: 修复prefixQuery字段引用错误

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

@@ -257,7 +257,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
 
         String orgCode = filter.getString("orgCode");
-        boolMust.must(QueryBuilders.prefixQuery("superviseOrgCode", orgCode));
+        boolMust.must(QueryBuilders.prefixQuery("superviseOrgCode.keyword", orgCode));
 
         JSONObject filterParams = null;
         if (!ObjectUtils.isEmpty(filter.get("filterParams"))) {
@@ -560,7 +560,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
 
         String orgCode = filter.getString("orgCode");
-        boolMust.must(QueryBuilders.prefixQuery("superviseOrgCode", orgCode));
+        boolMust.must(QueryBuilders.prefixQuery("superviseOrgCode.keyword", orgCode));
         getCompanyBoolQueryBuilder(filter, boolMust);
 
         // 排序
@@ -2666,10 +2666,10 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
             }
             data = queryDpEquipStatistics(filter, request, builder, boolMust, tabTotalMap);
         } else if (StatisticalAnalysisEnum.company.getCode().equals(businessType)) {
-            boolMust.must(QueryBuilders.prefixQuery("superviseOrgCode", orgCode));
+            boolMust.must(QueryBuilders.prefixQuery("superviseOrgCode.keyword", orgCode));
             data = queryDpCompanyStatistics(filter, request, builder, boolMust, tabTotalMap);
         } else {
-            boolMust.must(QueryBuilders.prefixQuery("superviseOrgCode", orgCode));
+            boolMust.must(QueryBuilders.prefixQuery("superviseOrgCode.keyword", orgCode));
             data = queryDpPersonStatistics(filter, request, builder, boolMust, tabTotalMap);
         }
 
@@ -2693,9 +2693,9 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         }
         equipBoolMust.mustNot(QueryBuilders.termsQuery("STATUS", Arrays.asList("草稿", "已拒领", "待认领")));
         BoolQueryBuilder companyBoolMust = QueryBuilders.boolQuery();
-        companyBoolMust.must(QueryBuilders.prefixQuery("superviseOrgCode", orgCode));
+        companyBoolMust.must(QueryBuilders.prefixQuery("superviseOrgCode.keyword", orgCode));
         BoolQueryBuilder personBoolMust = QueryBuilders.boolQuery();
-        personBoolMust.must(QueryBuilders.prefixQuery("superviseOrgCode", orgCode));
+        personBoolMust.must(QueryBuilders.prefixQuery("superviseOrgCode.keyword", orgCode));
         String equipIndex = StatisticalAnalysisEnum.equip.getKey();
         String companyIndex = StatisticalAnalysisEnum.company.getKey();
         String personIndex = StatisticalAnalysisEnum.person.getKey();
@@ -3078,7 +3078,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
 
         BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
         String orgCode = filter.getString("orgCode");
-        boolQuery.must(QueryBuilders.prefixQuery("superviseOrgCode", orgCode));
+        boolQuery.must(QueryBuilders.prefixQuery("superviseOrgCode.keyword", orgCode));
 
         JSONObject filterParams = JSONObject.parseObject(JSONObject.toJSONString(filter.get("filterParams")));
         String filterType = "advanced";

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

@@ -449,16 +449,15 @@ public class JGDPStatisticsServiceImpl {
     }
 
     private void staticsPersonCountByEs(String orgCode, String key, Map<String, Object> result) {
-        String index = StatisticalAnalysisEnum.person.getKey();
         SearchRequest request = new SearchRequest();
         SearchSourceBuilder builder = new SearchSourceBuilder();
         builder.trackTotalHits(true);
-        request.indices(index);
+        request.indices(key);
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
-        boolMust.must(QueryBuilders.prefixQuery("superviseOrgCode", orgCode));
-        Long personSum = statisticalAnalysisService.getStatisticCount(boolMust, index);
+        boolMust.must(QueryBuilders.prefixQuery("superviseOrgCode.keyword", orgCode));
+        Long personSum = statisticalAnalysisService.getStatisticCount(boolMust, key);
         boolMust.must(QueryBuilders.matchQuery("newPost", "6552"));
-        Long operatorsNum = statisticalAnalysisService.getStatisticCount(boolMust, index);
+        Long operatorsNum = statisticalAnalysisService.getStatisticCount(boolMust, key);
         result.put(DPMapStatisticsItemEnum.OPERATORS.getCode(), operatorsNum);
         result.put(DPMapStatisticsItemEnum.PERSON_TOTAL.getCode(), personSum);
     }
@@ -484,7 +483,7 @@ public class JGDPStatisticsServiceImpl {
         builder.trackTotalHits(true);
         request.indices(index);
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
-        boolMust.must(QueryBuilders.prefixQuery("superviseOrgCode", orgCode));
+        boolMust.must(QueryBuilders.prefixQuery("superviseOrgCode.keyword", orgCode));
         Long companySum = statisticalAnalysisService.getStatisticCount(boolMust, index);
 
         // 聚合查询