Commit c221bbbf authored by suhuiguang's avatar suhuiguang

1.通用设备分页查询增加查询条件:

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