feat: 大屏总览——一物一赋码卡片查询修改

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

@@ -20,6 +20,7 @@ import com.yeejoin.amos.boot.module.common.api.enums.CylinderTypeEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.UnitTypeEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.UserPostEnum;
 import com.yeejoin.amos.boot.module.statistcs.biz.utils.JsonUtils;
+import com.yeejoin.amos.boot.module.statistcs.biz.utils.QueryBuilderUtils;
 import com.yeejoin.amos.boot.module.statistics.api.enums.InformationManageTypeEnum;
 import com.yeejoin.amos.boot.module.statistics.api.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.AlertStatisticsMapper;
@@ -755,11 +756,15 @@ public class ZLDPStatisticsServiceImpl {
                 .filter(region -> !"西咸新区".equals(region.getRegionName()))
                 .map(region -> {
                     String orgCode = stCommonService.getAndSetOrgCode(region.getRegionCode().toString());
-                    Long equipIsManageNum = staticsCenterMapCountDataForEquipIsManage(orgCode, paramDto);
-                    Long equipTotal = getEquipTotalForCode(paramDto.getTreeValue(), region.getRegionCode().toString());
+                    BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
+                    queryBuilder.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
+                    queryBuilder.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE", "null"));
+                    Long equipIsManageNum = staticsCenterMapCountDataForEquipIsManage(queryBuilder,orgCode, paramDto);
+                    Long equipTotal = staticsCenterMapCountDataForEquipIsManage(null, orgCode, paramDto);
                     CountDto dto = new CountDto();
                     dto.setLongValue(equipTotal);
                     dto.setStrValue(calculateClaimRate(equipTotal, equipIsManageNum, decimalFormat));
+                    dto.setKeyStr(orgCode);
                     return dto;
                 }).collect(Collectors.toList());
     }
@@ -812,17 +817,19 @@ public class ZLDPStatisticsServiceImpl {
         return decimalFormat.format(claimRate);
     }
 
-    private Long staticsCenterMapCountDataForEquipIsManage(String orgCode, DPFilterParamForDetailDto paramDto) {
+
+    private Long staticsCenterMapCountDataForEquipIsManage(BoolQueryBuilder queryBuilder, String orgCode, DPFilterParamForDetailDto paramDto) {
         long num = 0;
         CountRequest request = new CountRequest();
-        request.indices("idx_biz_view_jg_all");
+        request.indices("idx_biz_equipment_info");
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
+        if (!ObjectUtils.isEmpty(queryBuilder)) {
+            boolMust = QueryBuilderUtils.copyBoolQuery(queryBuilder);
+        }
         // 按照管辖机构区域信息模糊查询
-        boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
-        boolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE","null"));
-        String[] status = {"草稿","已拒领","待认领"};
-        boolMust.mustNot(QueryBuilders.termsQuery("STATUS",Arrays.asList(status)));
+        boolMust.must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE", orgCode));
+        String[] status = {"草稿", "已拒领", "待认领"};
+        boolMust.mustNot(QueryBuilders.termsQuery("STATUS", Arrays.asList(status)));
         String[] equCategoryCode = {"2300"};
         boolMust.mustNot(QueryBuilders.termsQuery("EQU_CATEGORY_CODE",Arrays.asList(equCategoryCode)));
         String[] equListCode = {"8000"};