Commit 7b927db5 authored by suhuiguang's avatar suhuiguang

1.修改注释1.通用设备分页查询增加查询条件:

设备代码模糊查询、单位内部编号模糊查询
parent 02884ebe
...@@ -1271,16 +1271,15 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -1271,16 +1271,15 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
BoolQueryBuilder pBuilder = QueryBuilders.boolQuery(); BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
String test = QueryParser.escape(map.getString("EQU_CODE")); String test = QueryParser.escape(map.getString("EQU_CODE"));
pBuilder.must(QueryBuilders.wildcardQuery("EQU_CODE", "*" + test.toLowerCase() + "*")); pBuilder.must(QueryBuilders.wildcardQuery("EQU_CODE", "*" + test.toLowerCase() + "*"));
boolMust.must(meBuilder); boolMust.must(pBuilder);
} }
// 单位内部编号模糊查询 // 单位内部编号模糊查询
if (!ObjectUtils.isEmpty(map.getString("USE_INNER_CODE"))) { if (!ObjectUtils.isEmpty(map.getString("USE_INNER_CODE"))) {
BoolQueryBuilder pBuilder = QueryBuilders.boolQuery(); BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
String test = QueryParser.escape(map.getString("USE_INNER_CODE")); String test = QueryParser.escape(map.getString("USE_INNER_CODE"));
pBuilder.must(QueryBuilders.wildcardQuery("USE_INNER_CODE", "*" + test.toLowerCase() + "*")); pBuilder.must(QueryBuilders.wildcardQuery("USE_INNER_CODE", "*" + test.toLowerCase() + "*"));
boolMust.must(meBuilder); boolMust.must(pBuilder);
} }
builder.query(boolMust); builder.query(boolMust);
builder.sort("REC_DATE", SortOrder.DESC); builder.sort("REC_DATE", SortOrder.DESC);
builder.from((pageNumber - 1) * size); builder.from((pageNumber - 1) * size);
......
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