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

@@ -861,12 +861,21 @@ public class ZLDPStatisticsServiceImpl {
             meBuilder.must(QueryBuilders.matchPhraseQuery("SEQUENCE_NBR", "*" + test + "*"));
             boolMust.must(meBuilder);
         }
-
+        if (!ObjectUtils.isEmpty(map.getString("USE_PLACE"))) {
+            BoolQueryBuilder query = QueryBuilders.boolQuery();
+            String test = QueryParser.escape(map.getString("USE_PLACE"));
+            query.must(QueryBuilders.matchPhraseQuery("USE_PLACE", "*" + test + "*"));
+            boolMust.must(query);
+        }
         if (!ObjectUtils.isEmpty(map.getString("cityCode"))) {
             String orgCode = stCommonService.getAndSetOrgCode((String) map.get("cityCode"));
             boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
         }
 
+        if (!ObjectUtils.isEmpty(map.getString("ORG_BRANCH_CODE"))) {
+            boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(map.getString("ORG_BRANCH_CODE")) + "*"));
+        }
+
         if (!ObjectUtils.isEmpty(map.getString("superviseUnitName"))) {
             BoolQueryBuilder query = QueryBuilders.boolQuery();
             String test = QueryParser.escape(map.getString("superviseUnitName"));