1.修改已纳管过滤条件为已赋码

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

@@ -117,12 +117,15 @@ public class CylinderDPStatisticsServiceImpl {
         }
         SearchRequest searchRequest = new SearchRequest("idx_biz_view_jg_all");
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
+        //状态为已认领
+        String[] status = {"草稿","已拒领","待认领"};
         // 构建查询条件
         searchSourceBuilder.query(
                 QueryBuilders.boolQuery()
                         .must(QueryBuilders.termQuery("EQU_CATEGORY_CODE", "2300"))
-                        // 只统计已纳管设备
-                        .must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE))
+                        .mustNot(QueryBuilders.termsQuery("STATUS",Arrays.asList(status)))
+                        .mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE","null"))
+                        .must(QueryBuilders.existsQuery("SUPERVISORY_CODE"))
                         // 按照管辖机构区域信息模糊查询
                         .must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"))
         );

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

@@ -118,15 +118,20 @@ public class EnterpriseBizServiceImpl {
         if (tzBaseEnterpriseInfoDto.getUnitType().contains(UnitTypeEnum.CZDW.getName())) {
             SearchRequest searchRequest = new SearchRequest("idx_biz_view_jg_all");
             SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
-
+            //状态为已认领
+            String[] status = {"草稿","已拒领","待认领"};
             // 构建查询条件
             searchSourceBuilder.query(
                     QueryBuilders.boolQuery()
+                            //已认领
+                            .mustNot(QueryBuilders.termsQuery("STATUS",Arrays.asList(status)))
+                            //已赋码
+                            .mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE","null"))
+                            .must(QueryBuilders.existsQuery("SUPERVISORY_CODE"))
                             .must(QueryBuilders.termQuery("EQU_CATEGORY_CODE", "2300"))
-                            // 只统计已纳管设备
-                            .must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE))
                             // 按照管辖机构区域信息模糊查询
                             .must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCodeList.get(0)) + "*"))
+
             );
             TermsAggregationBuilder aggregation = AggregationBuilders.terms("USE_UNIT_CREDIT_CODE").field("USE_UNIT_CREDIT_CODE.keyword").size(10);
             searchSourceBuilder.aggregation(aggregation);

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

@@ -623,8 +623,12 @@ public class JGDPStatisticsServiceImpl {
         }
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 只统计已纳管的设备
-        boolMust.must(QueryBuilders.termsQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
+        //已赋码
+        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.termsQuery("EQU_STATE", Arrays.asList(states)));
         // 且8大类，目的去掉脏数据
@@ -688,8 +692,12 @@ public class JGDPStatisticsServiceImpl {
         }
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 只统计已纳管设备
-        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
+        //已赋码
+        boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
+        boolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE","null"));
+        //状态为已认领
+        String[] status = {"草稿","已拒领","待认领"};
+        boolMust.mustNot(QueryBuilders.termsQuery("STATUS",Arrays.asList(status)));
         // 且下次检验日期大于等于当天
         long currentDayTime = DateUtil.parse(DateUtil.today(), "yyy-MM-dd").getTime();
         // 且查询 下次检验日期 <= 当前天+30天 极为临期
@@ -725,8 +733,12 @@ public class JGDPStatisticsServiceImpl {
         }
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 只统计已纳管设备
-        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
+        //已赋码
+        boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
+        boolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE","null"));
+        //状态为已认领
+        String[] status = {"草稿","已拒领","待认领"};
+        boolMust.mustNot(QueryBuilders.termsQuery("STATUS",Arrays.asList(status)));
         // 查询下次检验日期小于当前天的设备，即为超期检验超期设备
         long currentDayTime = DateUtil.parse(DateUtil.now(), "yyy-MM-dd").getTime();
         boolMust.must(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").lt(currentDayTime));
@@ -955,8 +967,12 @@ public class JGDPStatisticsServiceImpl {
         }
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 只统计已纳管设备
-        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
+        //已赋码
+        boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
+        boolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE","null"));
+        //状态为已认领
+        String[] status = {"草稿","已拒领","待认领"};
+        boolMust.mustNot(QueryBuilders.termsQuery("STATUS",Arrays.asList(status)));
         // 且8大类，目的去掉脏数据
         boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE", StCommonServiceImpl.getEquipmentCategory().stream().map(EquipmentCategoryDto::getCode).collect(Collectors.toList())));
         SearchSourceBuilder builder = new SearchSourceBuilder();
@@ -1505,8 +1521,12 @@ public class JGDPStatisticsServiceImpl {
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 只统计已纳管设备
-        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
+        //已赋码
+        boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
+        boolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE","null"));
+        //状态为已认领
+        String[] status = {"草稿","已拒领","待认领"};
+        boolMust.mustNot(QueryBuilders.termsQuery("STATUS",Arrays.asList(status)));
         // 且8大类，目的去掉脏数据
         boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE", StCommonServiceImpl.getEquipmentCategory().stream().map(EquipmentCategoryDto::getCode).collect(Collectors.toList())));
         request.query(boolMust);
@@ -2115,6 +2135,13 @@ public class JGDPStatisticsServiceImpl {
             String param = QueryParser.escape(map.getString(IS_INTO_MANAGEMENT));
             pBuilder.must(QueryBuilders.matchQuery(IS_INTO_MANAGEMENT, param));
             boolMust.must(pBuilder);
+        } else{
+            //已赋码
+            boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
+            boolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE","null"));
+            //状态为已认领
+            String[] status = {"草稿","已拒领","待认领"};
+            boolMust.mustNot(QueryBuilders.termsQuery("STATUS",Arrays.asList(status)));
         }
         if (!ObjectUtils.isEmpty(map.getString(EQU_CATEGORY))) {
             BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();

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

@@ -62,8 +62,6 @@ import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.yeejoin.amos.boot.module.statistcs.biz.service.impl.ZLDPStatisticsServiceImpl.IS_INTO_MANAGEMENT;
-
 /**
  * 大屏统计实现类
  *
@@ -591,8 +589,12 @@ public class JYJCDPStatisticsServiceImpl {
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 只统计已纳管设备
-        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
+        //已赋码
+        boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
+        boolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE","null"));
+        //状态为已认领
+        String[] status = {"草稿","已拒领","待认领"};
+        boolMust.mustNot(QueryBuilders.termsQuery("STATUS",Arrays.asList(status)));
         // 且下次检验日期大于等于当天
         long currentDayTime = DateUtil.parse(DateUtil.today(), "yyy-MM-dd").getTime();
         // 且查询 下次检验日期 <= 当前天+30天 极为临期
@@ -618,8 +620,12 @@ public class JYJCDPStatisticsServiceImpl {
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 只统计已纳管设备
-        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
+        //已赋码
+        boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
+        boolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE","null"));
+        //状态为已认领
+        String[] status = {"草稿","已拒领","待认领"};
+        boolMust.mustNot(QueryBuilders.termsQuery("STATUS",Arrays.asList(status)));
         // 查询下次检验日期小于当前天的设备，即为超期检验超期设备
         long currentDayTime = DateUtil.parse(DateUtil.now(), "yyy-MM-dd").getTime();
         boolMust.must(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").lt(currentDayTime));
@@ -734,8 +740,12 @@ public class JYJCDPStatisticsServiceImpl {
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamForDetailDto.getCityCode());
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 只统计已纳管设备
-        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
+        //已赋码
+        boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
+        boolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE","null"));
+        //状态为已认领
+        String[] status = {"草稿","已拒领","待认领"};
+        boolMust.mustNot(QueryBuilders.termsQuery("STATUS",Arrays.asList(status)));
         // 且下次检验日期大于等于当天 且查询 下次检验日期 <= 当前天+30天 即为临期
         long currentDayTime = DateUtil.parse(DateUtil.today(), "yyy-MM-dd").getTime();
         long currentDayAfter30DayTime = DateUtil.offsetDay(DateUtil.parse(DateUtil.today(), "yyy-MM-dd"), 30).getTime();
@@ -773,8 +783,12 @@ public class JYJCDPStatisticsServiceImpl {
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamForDetailDto.getCityCode());
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 只统计已纳管设备
-        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
+        //已赋码
+        boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
+        boolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE","null"));
+        //状态为已认领
+        String[] status = {"草稿","已拒领","待认领"};
+        boolMust.mustNot(QueryBuilders.termsQuery("STATUS",Arrays.asList(status)));
         // 查询下次检验日期小于当前天的设备，即为超期检验超期设备
         long currentDayTime = DateUtil.parse(DateUtil.now(), "yyy-MM-dd").getTime();
         boolMust.must(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").lt(currentDayTime));
@@ -816,8 +830,12 @@ public class JYJCDPStatisticsServiceImpl {
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 只统计已纳管设备
-        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
+        //已赋码
+        boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
+        boolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE","null"));
+        //状态为已认领
+        String[] status = {"草稿","已拒领","待认领"};
+        boolMust.mustNot(QueryBuilders.termsQuery("STATUS",Arrays.asList(status)));
         // 且下次检验日期大于等于当天 且查询 下次检验日期 <= 当前天+30天 即为临期
         long currentDayTime = DateUtil.parse(DateUtil.today(), "yyy-MM-dd").getTime();
         long currentDayAfter30DayTime = DateUtil.offsetDay(DateUtil.parse(DateUtil.today(), "yyy-MM-dd"), 30).getTime();
@@ -875,8 +893,12 @@ public class JYJCDPStatisticsServiceImpl {
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 只统计已纳管设备
-        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
+        //已赋码
+        boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
+        boolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE","null"));
+        //状态为已认领
+        String[] status = {"草稿","已拒领","待认领"};
+        boolMust.mustNot(QueryBuilders.termsQuery("STATUS",Arrays.asList(status)));
         // 查询下次检验日期小于当前天的设备，即为超期检验超期设备
         long currentDayTime = DateUtil.parse(DateUtil.now(), "yyy-MM-dd").getTime();
         boolMust.must(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").lt(currentDayTime));
@@ -1287,10 +1309,12 @@ public class JYJCDPStatisticsServiceImpl {
             boolMust.must(shouldBuilder);
         }
 
-        BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
-        String param = QueryParser.escape("true");
-        pBuilder.must(QueryBuilders.matchQuery(IS_INTO_MANAGEMENT, param));
-        boolMust.must(pBuilder);
+        //已赋码
+        boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
+        boolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE","null"));
+        //状态为已认领
+        String[] statusArray = {"草稿","已拒领","待认领"};
+        boolMust.mustNot(QueryBuilders.termsQuery("STATUS",Arrays.asList(statusArray)));
 
         builder.query(boolMust);
         builder.sort("REC_DATE", SortOrder.DESC);

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

@@ -525,8 +525,12 @@ public class YJDPStatisticsServiceImpl {
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 只统计已纳管设备
-        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
+        //已赋码
+        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.termQuery("EQU_LIST_CODE", EquipmentClassifityEnum.DT.getCode()));
         request.query(boolMust);

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

@@ -535,11 +535,12 @@ public class ZLDPStatisticsServiceImpl {
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
         // 且8大类，目的去掉脏数据
         boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE",StCommonServiceImpl.getEquipmentCategory().stream().map(EquipmentCategoryDto::getCode).collect(Collectors.toList())));
-        // 只统计已纳管设备
-        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", Boolean.TRUE));
-        // 有监管码
+        //已赋码
         boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
         boolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE","null"));
+        //状态为已认领
+        String[] status = {"草稿","已拒领","待认领"};
+        boolMust.mustNot(QueryBuilders.termsQuery("STATUS",Arrays.asList(status)));
         searchSourceBuilder.query(boolMust);
         searchSourceBuilder.aggregation(AggregationBuilders.terms("count_by_use_site_code").field("USE_SITE_CODE").size(500));
         searchRequest.source(searchSourceBuilder);
@@ -1070,9 +1071,12 @@ public class ZLDPStatisticsServiceImpl {
         }
 
         BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
-        String param = QueryParser.escape("true");
-        pBuilder.must(QueryBuilders.matchQuery(IS_INTO_MANAGEMENT, param));
-        boolMust.must(pBuilder);
+        //已赋码
+        boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
+        boolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE","null"));
+        //状态为已认领
+        String[] statusArray = {"草稿","已拒领","待认领"};
+        boolMust.mustNot(QueryBuilders.termsQuery("STATUS",Arrays.asList(statusArray)));
         boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE",
                 StCommonServiceImpl.getEquipmentCategory().stream().map(EquipmentCategoryDto::getCode).collect(Collectors.toList())));