Commit cb456ee1 authored by 韩桐桐's avatar 韩桐桐

设备状态查询:未登记类型查询设备状态为空的数据

parent 4a939d48
......@@ -2624,8 +2624,13 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
// 设备状态
if (!ObjectUtils.isEmpty(map.getString("EQU_STATE"))) {
BoolQueryBuilder esBuilder = QueryBuilders.boolQuery();
String param = QueryParser.escape(map.getLong("EQU_STATE").toString());
esBuilder.must(QueryBuilders.matchQuery("EQU_STATE", param));
if (map.getString("EQU_STATE").equals(EquimentEnum.WEIDENGJI.getName())) {
esBuilder.should(QueryBuilders.boolQuery().mustNot(QueryBuilders.existsQuery("EQU_STATE")));
esBuilder.should(QueryBuilders.boolQuery().must(QueryBuilders.matchPhraseQuery("EQU_STATE", "")));
} else {
String param = QueryParser.escape(map.getLong("EQU_STATE").toString());
esBuilder.must(QueryBuilders.matchQuery("EQU_STATE", param));
}
boolMust.must(esBuilder);
}
......
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