fix(core): 调整设备查询条件ORG_BRANCH_CODE规则

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

@@ -890,7 +890,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
 
         String orgCode = filter.getString("orgCode");
-        handleOrgCode(boolMust, orgCode);
+        boolMust.must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE", orgCode));
         boolMust.mustNot(QueryBuilders.termsQuery("STATUS", Arrays.asList("草稿", "已拒领", "待认领")));
         JSONObject filterParams = new JSONObject();
         // 筛选
@@ -2778,7 +2778,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
 
         List<Map<String, Object>> data = new ArrayList<>();
         if (StatisticalAnalysisEnum.equip.getCode().equals(businessType)) {
-            handleOrgCode(boolMust, orgCode);
+            boolMust.must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE", orgCode));
             data = queryDpEquipStatistics(filter, request, builder, boolMust, tabTotalMap);
         } else if (StatisticalAnalysisEnum.company.getCode().equals(businessType)) {
             boolMust.must(QueryBuilders.prefixQuery("superviseOrgCode.keyword", orgCode));
@@ -2797,7 +2797,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
 
     private void getTypeCount(String businessType, Map<String, Object> tabTotalMap, String orgCode, List<Map<String, Object>> data) {
         BoolQueryBuilder equipBoolMust = QueryBuilders.boolQuery();
-        handleOrgCode(equipBoolMust, orgCode);
+        equipBoolMust.must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE", orgCode));
         equipBoolMust.mustNot(QueryBuilders.termsQuery("STATUS", Arrays.asList("草稿", "已拒领", "待认领")));
         equipBoolMust.mustNot(QueryBuilders.termQuery("EQU_CATEGORY_CODE", "2300"));
         equipBoolMust.mustNot(QueryBuilders.termQuery("EQU_LIST_CODE", "8000"));