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

@@ -706,7 +706,7 @@ public class ZLDPStatisticsServiceImpl {
         Map<String, Object> result = new HashMap<>();
         List<Map<String, Object>> legendData = new ArrayList<>();
         legendData.add(createLegend("设备总数", "equipTotal", "bar", "个"));
-        legendData.add(createLegend("纳管率", "claimRate", "line", "%"));
+        legendData.add(createLegend("赋码率", "claimRate", "line", "%"));
 
         List<RegionModel> regionList = stCommonService.setRegionIfRootParentAndNoAccessIf3Level("610000");
         // 获取区域名称并过滤
@@ -793,8 +793,10 @@ public class ZLDPStatisticsServiceImpl {
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 设备类别精确查询气瓶
-        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
+        boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
+        boolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE","null"));
+        String[] status = {"草稿","已拒领","待认领"};
+        boolMust.mustNot(QueryBuilders.termsQuery("STATUS",Arrays.asList(status)));
 
         if (StringUtils.isNotEmpty(paramDto.getTreeValue())) {
             if ("2300".equals(paramDto.getTreeValue())){