Skip to content

A
amos-boot-biz
Commit 50ccbc8e authored by suhuiguang's avatar suhuiguang
Browse files
Options

Merge branch 'develop_tzs_register' of…

Merge branch 'develop_tzs_register' of http://36.40.66.175:5000/moa/amos-boot-biz into develop_tzs_register
parents 81de7433 5a473f67
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/service/impl/CylinderInfoServiceImpl.java
View file @ 50ccbc8e
...@@ -1025,7 +1025,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind ...@@ -1025,7 +1025,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);
} }
...@@ -1050,7 +1050,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind ...@@ -1050,7 +1050,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);
} }
...@@ -1066,7 +1066,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind ...@@ -1066,7 +1066,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);
} }
...@@ -1090,7 +1090,7 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind ...@@ -1090,7 +1090,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