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

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

@@ -923,10 +923,12 @@ public class ZLDPStatisticsServiceImpl {
             pBuilder.must(QueryBuilders.matchQuery(IS_INTO_MANAGEMENT, param));
             boolMust.must(pBuilder);
         }else{
-            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[] status = {"草稿","已拒领","待认领"};
+            boolMust.mustNot(QueryBuilders.termsQuery("STATUS",Arrays.asList(status)));
         }
 
         builder.query(boolMust);