大屏地图和八大类修改已纳管查询条件为已赋码和已认领

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

@@ -256,8 +256,12 @@ public class CylinderDPStatisticsServiceImpl {
         boolMust.must(QueryBuilders.termQuery("EQU_CATEGORY_CODE", "2300"));
         // 按照管辖机构区域信息模糊查询
         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)));
         request.query(boolMust);
         try {
             CountResponse response = restHighLevelClient.count(request, RequestOptions.DEFAULT);
@@ -276,8 +280,12 @@ public class CylinderDPStatisticsServiceImpl {
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.termQuery("WHETHER_VEHICLE_CYLINDER.keyword", "1"));
         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)));
         request.query(boolMust);
         try {
             CountResponse response = restHighLevelClient.count(request, RequestOptions.DEFAULT);
@@ -344,8 +352,12 @@ public class CylinderDPStatisticsServiceImpl {
         boolMust.must(QueryBuilders.termQuery("EQU_CATEGORY_CODE", "2300"));
         // 按照管辖机构区域信息模糊查询
         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天 极为临期
@@ -377,8 +389,12 @@ public class CylinderDPStatisticsServiceImpl {
         boolMust.must(QueryBuilders.termQuery("EQU_CATEGORY_CODE", "2300"));
         // 按照管辖机构区域信息模糊查询
         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));

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

@@ -546,8 +546,13 @@ 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)));
+
         // 且设备品种3级,按照真实的过滤，防止有脏数据
         boolMust.must(QueryBuilders.termsQuery("EQU_DEFINE_CODE.keyword", ELEVATOR_EQU_DEFINE_CODES.split(",")));
         SearchSourceBuilder builder = new SearchSourceBuilder();