调整设备区域查询方法

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/DPStatisticsServiceImpl.java

@@ -299,8 +299,6 @@ public class DPStatisticsServiceImpl {
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
         // 设备类别精确查询气瓶
         boolMust.must(QueryBuilders.termsQuery("EQU_CATEGORY_CODE", EQU_CATEGORY_CYLINDER));
-        // 纳管状态为已纳管
-        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
         request.query(boolMust);
         try {
             CountResponse response = restHighLevelClient.count(request, RequestOptions.DEFAULT);
@@ -328,8 +326,6 @@ public class DPStatisticsServiceImpl {
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 纳管状态为已纳管
-        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
         SearchSourceBuilder builder = new SearchSourceBuilder();
         builder.query(boolMust);
         TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms("count_by_equ_list_code").field("EQU_LIST_CODE");
@@ -524,8 +520,6 @@ public class DPStatisticsServiceImpl {
         String orgCode = getAndSetOrgCode(dpFilterParamDto.getCityCode());
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 纳管状态为已纳管
-        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
         // 设备状态过滤
         boolMust.must(QueryBuilders.termsQuery("EQU_STATE", states));
         request.query(boolMust);
@@ -699,8 +693,6 @@ public class DPStatisticsServiceImpl {
         String orgCode = this.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 纳管状态为已纳管
-        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
         SearchSourceBuilder builder = new SearchSourceBuilder();
         builder.query(boolMust);
         TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms("EQU_STATE_COUNT").field("EQU_STATE");
@@ -753,8 +745,6 @@ public class DPStatisticsServiceImpl {
         String orgCode = this.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 纳管状态为已纳管
-        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
         SearchSourceBuilder builder = new SearchSourceBuilder();
         builder.query(boolMust);
         // 设备状态
@@ -1463,8 +1453,6 @@ public class DPStatisticsServiceImpl {
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 纳管状态为已纳管
-        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
         request.query(boolMust);
         try {
             CountResponse response = restHighLevelClient.count(request, RequestOptions.DEFAULT);

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/DPStatisticsServiceImpl.java

@@ -389,8 +389,6 @@ public class DPStatisticsServiceImpl {
         String orgCode = this.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 且纳管状态为已纳管
-        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
         // 且在用状态设备
         boolMust.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
         // 且下次检验日期大于等于当天
@@ -417,8 +415,6 @@ public class DPStatisticsServiceImpl {
         String orgCode = this.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 纳管状态为已纳管
-        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
         // 在用状态设备
         boolMust.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
         // 查询下次检验日期小于当前天的设备，即为超期检验超期设备
@@ -492,8 +488,6 @@ public class DPStatisticsServiceImpl {
         String orgCode = this.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 且纳管状态为已纳管
-        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
         // 且在用状态设备
         boolMust.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
         // 且下次检验日期大于等于当天 且查询 下次检验日期 <= 当前天+30天 极为临期
@@ -531,8 +525,6 @@ public class DPStatisticsServiceImpl {
         String orgCode = this.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 纳管状态为已纳管
-        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
         // 在用状态设备
         boolMust.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
         // 查询下次检验日期小于当前天的设备，即为超期检验超期设备