Commit 53ca8514 authored by 韩桐桐's avatar 韩桐桐

fix(jg):查询设备接口 添加设备类别过滤条件

parent 14a8ed88
...@@ -755,6 +755,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -755,6 +755,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
return objMap; return objMap;
} }
/** /**
* 查询设备技术参数 * 查询设备技术参数
* *
...@@ -1181,6 +1183,13 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -1181,6 +1183,13 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
elcBuilder.must(QueryBuilders.matchPhraseQuery("EQU_LIST_CODE", test)); elcBuilder.must(QueryBuilders.matchPhraseQuery("EQU_LIST_CODE", test));
boolMust.must(elcBuilder); boolMust.must(elcBuilder);
} }
//设备类别编码
if (!ObjectUtils.isEmpty(map.getString("EQU_DEFINE_CODE"))) {
BoolQueryBuilder elcBuilder = QueryBuilders.boolQuery();
String test = QueryParser.escape(map.getString("EQU_DEFINE_CODE"));
elcBuilder.must(QueryBuilders.matchPhraseQuery("EQU_DEFINE_CODE", test));
boolMust.must(elcBuilder);
}
//设备种类名称 //设备种类名称
if (!ObjectUtils.isEmpty(map.getString("EQU_LIST"))) { if (!ObjectUtils.isEmpty(map.getString("EQU_LIST"))) {
BoolQueryBuilder elBuilder = QueryBuilders.boolQuery(); BoolQueryBuilder elBuilder = 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