Commit dd5a1ffa authored by Lambertliu's avatar Lambertliu

fix(cylinder):气瓶-筛选条件筛选错误问题解决

parent 280f7841
...@@ -309,7 +309,7 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin ...@@ -309,7 +309,7 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
if (!ObjectUtils.isEmpty(esCylinderFillingRecordDto.getRegionCode())) { if (!ObjectUtils.isEmpty(esCylinderFillingRecordDto.getRegionCode())) {
flag = false; flag = false;
BoolQueryBuilder query = QueryBuilders.boolQuery(); BoolQueryBuilder query = QueryBuilders.boolQuery();
query.must(QueryBuilders.matchQuery("regionCode", "*" + esCylinderFillingRecordDto.getRegionCode() + "*")); query.must(QueryBuilders.wildcardQuery("regionCode", "*" + esCylinderFillingRecordDto.getRegionCode() + "*"));
boolMust.must(query); boolMust.must(query);
} }
...@@ -333,7 +333,7 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin ...@@ -333,7 +333,7 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
if (!ObjectUtils.isEmpty(esCylinderFillingRecordDto.getFactoryNum())) { if (!ObjectUtils.isEmpty(esCylinderFillingRecordDto.getFactoryNum())) {
flag = false; flag = false;
BoolQueryBuilder query = QueryBuilders.boolQuery(); BoolQueryBuilder query = QueryBuilders.boolQuery();
query.must(QueryBuilders.matchQuery("factoryNum", "*" + esCylinderFillingRecordDto.getFactoryNum() + "*")); query.must(QueryBuilders.wildcardQuery("factoryNum", "*" + esCylinderFillingRecordDto.getFactoryNum() + "*"));
boolMust.must(query); boolMust.must(query);
} }
...@@ -357,7 +357,7 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin ...@@ -357,7 +357,7 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
if (!ObjectUtils.isEmpty(esCylinderFillingRecordDto.getQrCode())) { if (!ObjectUtils.isEmpty(esCylinderFillingRecordDto.getQrCode())) {
flag = false; flag = false;
BoolQueryBuilder query = QueryBuilders.boolQuery(); BoolQueryBuilder query = QueryBuilders.boolQuery();
query.must(QueryBuilders.matchQuery("qrCode", "*" + esCylinderFillingRecordDto.getQrCode() + "*")); query.must(QueryBuilders.wildcardQuery("qrCode", "*" + esCylinderFillingRecordDto.getQrCode() + "*"));
boolMust.must(query); boolMust.must(query);
} }
......
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