Commit 8543bc1f authored by 刘林's avatar 刘林

fix(jg):气瓶导入出厂编码校验bug修改

parent ee3fb4f9
...@@ -2821,7 +2821,10 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -2821,7 +2821,10 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
if (!ObjectUtils.isEmpty(map.getString(DATA_QUALITY_SCORE_JG))) { if (!ObjectUtils.isEmpty(map.getString(DATA_QUALITY_SCORE_JG))) {
BoolQueryBuilder scBuilder = QueryBuilders.boolQuery(); BoolQueryBuilder scBuilder = QueryBuilders.boolQuery();
String param = map.getString(DATA_QUALITY_SCORE_JG); String param = map.getString(DATA_QUALITY_SCORE_JG);
List<String> strings = Arrays.asList(param.split(",")); List<String> strings = Arrays.stream(param.replaceAll("^\\[|\\]$", "").split(","))
.map(String::trim)
.filter(s -> !s.isEmpty())
.collect(Collectors.toList());
scBuilder.must(QueryBuilders.termsQuery("DATA_QUALITY_SCORE", strings)); scBuilder.must(QueryBuilders.termsQuery("DATA_QUALITY_SCORE", strings));
boolMust.must(scBuilder); boolMust.must(scBuilder);
} }
...@@ -4249,8 +4252,12 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste ...@@ -4249,8 +4252,12 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
.must(QueryBuilders.termQuery("EQU_CATEGORY_CODE", "2300")) .must(QueryBuilders.termQuery("EQU_CATEGORY_CODE", "2300"))
.must(QueryBuilders.termQuery("STATUS", "已认领")); .must(QueryBuilders.termQuery("STATUS", "已认领"));
if (nonVehicle) { if (nonVehicle) {
List<String> creditCodes = keys.stream().map(k -> k.split("_")[0]).collect(Collectors.toList()); List<String> creditCodes = keys.stream()
List<String> factoryNums = keys.stream().map(k -> k.split("_")[1]).collect(Collectors.toList()); .map(k -> k.substring(0, k.indexOf('_')))
.collect(Collectors.toList());
List<String> factoryNums = keys.stream()
.map(k -> k.substring(k.indexOf('_') + 1))
.collect(Collectors.toList());
boolQuery.must(QueryBuilders.termsQuery("FACTORY_NUM", factoryNums)) boolQuery.must(QueryBuilders.termsQuery("FACTORY_NUM", factoryNums))
.must(QueryBuilders.termsQuery("produceUnitCreditCode", creditCodes)); .must(QueryBuilders.termsQuery("produceUnitCreditCode", creditCodes));
} else { } else {
......
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