Commit 584e1f56 authored by Lambertliu's avatar Lambertliu

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

parent 6cb7fb76
...@@ -954,7 +954,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind ...@@ -954,7 +954,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
if (!ObjectUtils.isEmpty(cylinderInfoDto.getRegionCode())) { if (!ObjectUtils.isEmpty(cylinderInfoDto.getRegionCode())) {
flag = false; flag = false;
BoolQueryBuilder appIdBuilder = QueryBuilders.boolQuery(); BoolQueryBuilder appIdBuilder = QueryBuilders.boolQuery();
appIdBuilder.must(QueryBuilders.matchQuery("regionCode", "*" + cylinderInfoDto.getRegionCode() + "*")); appIdBuilder.must(QueryBuilders.wildcardQuery("regionCode", "*" + cylinderInfoDto.getRegionCode() + "*"));
boolMust.should(appIdBuilder); boolMust.should(appIdBuilder);
} }
...@@ -979,7 +979,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind ...@@ -979,7 +979,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
if (!ObjectUtils.isEmpty(cylinderInfoDto.getFactoryNum())) { if (!ObjectUtils.isEmpty(cylinderInfoDto.getFactoryNum())) {
flag = false; flag = false;
BoolQueryBuilder query = QueryBuilders.boolQuery(); BoolQueryBuilder query = QueryBuilders.boolQuery();
query.must(QueryBuilders.matchQuery("factoryNum", "*" + cylinderInfoDto.getFactoryNum() + "*")); query.must(QueryBuilders.wildcardQuery("factoryNum", "*" + cylinderInfoDto.getFactoryNum() + "*"));
boolMust.must(query); boolMust.must(query);
} }
...@@ -995,7 +995,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind ...@@ -995,7 +995,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
if (!ObjectUtils.isEmpty(cylinderInfoDto.getQrCode())) { if (!ObjectUtils.isEmpty(cylinderInfoDto.getQrCode())) {
flag = false; flag = false;
BoolQueryBuilder query = QueryBuilders.boolQuery(); BoolQueryBuilder query = QueryBuilders.boolQuery();
query.must(QueryBuilders.matchQuery("qrCode", "*" + cylinderInfoDto.getQrCode() + "*")); query.must(QueryBuilders.wildcardQuery("qrCode", "*" + cylinderInfoDto.getQrCode() + "*"));
boolMust.must(query); boolMust.must(query);
} }
...@@ -1019,7 +1019,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind ...@@ -1019,7 +1019,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
if (!ObjectUtils.isEmpty(cylinderInfoDto.getUnitInnerCode())) { if (!ObjectUtils.isEmpty(cylinderInfoDto.getUnitInnerCode())) {
flag = false; flag = false;
BoolQueryBuilder query = QueryBuilders.boolQuery(); BoolQueryBuilder query = QueryBuilders.boolQuery();
query.must(QueryBuilders.matchQuery("unitInnerCode", "*" + cylinderInfoDto.getUnitInnerCode() + "*")); query.must(QueryBuilders.wildcardQuery("unitInnerCode", "*" + cylinderInfoDto.getUnitInnerCode() + "*"));
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