大屏总揽设备赋码率接口赋码数量去掉压力管道和气瓶

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

@@ -797,7 +797,10 @@ public class ZLDPStatisticsServiceImpl {
         boolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE","null"));
         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"};
+        boolMust.mustNot(QueryBuilders.termsQuery("EQU_LIST_CODE",Arrays.asList(equListCode)));
         if (StringUtils.isNotEmpty(paramDto.getTreeValue())) {
             if ("2300".equals(paramDto.getTreeValue())){
                 boolMust.must(QueryBuilders.termQuery("EQU_CATEGORY_CODE", QueryParser.escape(paramDto.getTreeValue().toLowerCase())));