diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/service/impl/DataSyncServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/service/impl/DataSyncServiceImpl.java index a65524ea..d6eeb052 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/service/impl/DataSyncServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/service/impl/DataSyncServiceImpl.java @@ -213,10 +213,20 @@ public class DataSyncServiceImpl implements IDataSyncService { // 1.1.1.1.2.1 拼接 被代替标准号 String btd = bdtList.stream().map(info1 -> { String addStrandNumber = ""; - if (StringUtils.isNotEmpty(info1.getStandYear())) { - addStrandNumber = info1.getStandSort() + " " + info1.getStandNumber() + "-" + info1.getStandYear(); - } else { - addStrandNumber = info1.getStandSort() + " " + info1.getStandNumber(); + //var judgeFn = new RegExp(/\s+/g); + //if(judgeFn.test(nowstandinfo.standSort)){ + // nowstandinfo.standCode = nowstandinfo.standSort + "" + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear) + //}else if(nowstandinfo.standSort === 'Q/QCBFC'){ + // nowstandinfo.standCode = nowstandinfo.standSort + "" + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear) + //}else { + // nowstandinfo.standCode = nowstandinfo.standSort + " " + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear) + //} + if(StringUtils.isNotBlank(info1.getStandSort()) && info1.getStandSort().indexOf(" ")>0){ + addStrandNumber = info1.getStandSort() + info1.getStandNumber() +(StringUtils.isNotBlank(info1.getStandYear())?("-" + info1.getStandYear()):""); + }else if(StringUtils.isNotBlank(info1.getStandSort()) && info1.getStandSort() =="Q/QCBFC"){ + addStrandNumber = info1.getStandSort() + info1.getStandNumber() +(StringUtils.isNotBlank(info1.getStandYear())?("-" + info1.getStandYear()):""); + }else{ + addStrandNumber = info1.getStandSort()+" "+ info1.getStandNumber() +(StringUtils.isNotBlank(info1.getStandYear())?("-" + info1.getStandYear()):""); } return addStrandNumber; }).collect(Collectors.joining(","));