FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:修复再处理被代替标准号数据补全时，数据补充错误导致无法更新状态的BUG

Browse Source
This commit is contained in:
zyd
2022-10-24 11:04:46 +08:00
parent 5f1b490954
commit 8c01b11d18
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/service/impl/DataSyncServiceImpl.java
+14 -4
View File
@@ -213,10 +213,20 @@ public class DataSyncServiceImpl implements IDataSyncService {
// 1.1.1.1.2.1 拼接 被代替标准号 // 1.1.1.1.2.1 拼接 被代替标准号
String btd = bdtList.stream().map(info1 -> { String btd = bdtList.stream().map(info1 -> {
String addStrandNumber = ""; String addStrandNumber = "";
if (StringUtils.isNotEmpty(info1.getStandYear())) { //var judgeFn = new RegExp(/\s+/g);
addStrandNumber = info1.getStandSort() + " " + info1.getStandNumber() + "-" + info1.getStandYear(); //if(judgeFn.test(nowstandinfo.standSort)){
} else { // nowstandinfo.standCode = nowstandinfo.standSort + "" + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear)
addStrandNumber = info1.getStandSort() + " " + info1.getStandNumber(); //}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; return addStrandNumber;
}).collect(Collectors.joining(",")); }).collect(Collectors.joining(","));