bug修改

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

@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.enums.UnitTypeEnum;
+import com.yeejoin.amos.boot.module.statistics.api.enums.StatisticalAnalysisEnum;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.EnterpriseBizMapper;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.PageParam;
@@ -16,7 +17,6 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.lucene.queryparser.classic.QueryParser;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.RequestOptions;
@@ -135,7 +135,7 @@ public class EnterpriseBizServiceImpl {
         }
 
         if (tzBaseEnterpriseInfoDto.getUnitType().contains(UnitTypeEnum.CZDW.getName())) {
-            SearchRequest searchRequest = new SearchRequest("idx_biz_view_jg_all");
+            SearchRequest searchRequest = new SearchRequest(StatisticalAnalysisEnum.equip.getKey());
             SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
             //状态为已认领
             String[] status = {"草稿","已拒领","待认领"};
@@ -149,10 +149,10 @@ public class EnterpriseBizServiceImpl {
                             .must(QueryBuilders.existsQuery("SUPERVISORY_CODE"))
                             .must(QueryBuilders.termQuery("EQU_CATEGORY_CODE", "2300"))
                             // 按照管辖机构区域信息模糊查询
-                            .must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCodeList.get(0)) + "*"))
+                            .must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE", orgCodeList.get(0)))
 
             );
-            TermsAggregationBuilder aggregation = AggregationBuilders.terms("USE_UNIT_CREDIT_CODE").field("USE_UNIT_CREDIT_CODE.keyword").size(10);
+            TermsAggregationBuilder aggregation = AggregationBuilders.terms("USE_UNIT_CREDIT_CODE").field("USE_UNIT_CREDIT_CODE").size(10);
             searchSourceBuilder.aggregation(aggregation);
             searchRequest.source(searchSourceBuilder);
             try {