Commit b8e7f3b4 authored by 刘林's avatar 刘林

fix:大屏-总览-使用单位-详情-设备列表为空修复

parent 5d6bbd3d
...@@ -2136,12 +2136,24 @@ public class JGDPStatisticsServiceImpl { ...@@ -2136,12 +2136,24 @@ public class JGDPStatisticsServiceImpl {
pBuilder.must(QueryBuilders.matchQuery(IS_INTO_MANAGEMENT, param)); pBuilder.must(QueryBuilders.matchQuery(IS_INTO_MANAGEMENT, param));
boolMust.must(pBuilder); boolMust.must(pBuilder);
} else{ } else{
if("1".equals(map.getString("IS_SUPERVISORY"))){
//已赋码 //已赋码
boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE")); boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
boolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE","null")); boolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE","null"));
//状态为已认领 //状态为已认领
String[] status = {"草稿","已拒领","待认领"}; String[] status = {"草稿","已拒领","待认领"};
boolMust.mustNot(QueryBuilders.termsQuery("STATUS",Arrays.asList(status))); boolMust.mustNot(QueryBuilders.termsQuery("STATUS",Arrays.asList(status)));
}else if("2".equals(map.getString("IS_SUPERVISORY"))){
//未赋码
boolMust.mustNot(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
//状态为已认领
String[] status = {"草稿","已拒领","待认领"};
boolMust.mustNot(QueryBuilders.termsQuery("STATUS",Arrays.asList(status)));
}else{
//状态为已认领
String[] status = {"草稿","已拒领","待认领"};
boolMust.mustNot(QueryBuilders.termsQuery("STATUS",Arrays.asList(status)));
}
} }
if (!ObjectUtils.isEmpty(map.getString(EQU_CATEGORY))) { if (!ObjectUtils.isEmpty(map.getString(EQU_CATEGORY))) {
BoolQueryBuilder pBuilder = QueryBuilders.boolQuery(); BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment