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

Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216

Browse Source
This commit is contained in:
SUNJIABIN
2023-04-20 16:32:39 +08:00
parent 55c491f274 980c18e2a9
commit 14acd83561
1 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+30 -16
View File
@@ -4437,23 +4437,37 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
@Override @Override
public ResponseMessage selectByIdAtt(String id) { public ResponseMessage selectByIdAtt(String id) {
SarBussStandAttrInfo sarBussStandAttrInfo = sarBussStandAttrInfoService.selectByIdAtt(id);
List<SarBussStandAttrInfo> sarBussStandAttrInfoList = new ArrayList<>(); List<SarBussStandAttrInfo> sarBussStandAttrInfoList = new ArrayList<>();
if(sarBussStandAttrInfo!=null && StringUtils.isNotBlank(sarBussStandAttrInfo.getFbgbuss())){ if(StringUtils.isNotBlank(id)){
String[] split = sarBussStandAttrInfo.getFbgbuss().split(","); String[] split = id.split(",");
List<String> asList = Arrays.asList(split); if(split.length>0){
String fbgbussNmae = ""; for (String idInfos : split){
for(String idInfo :asList){ SarBussStandAttrInfo sarBussStandAttrInfo = sarBussStandAttrInfoService.selectByIdAtt(idInfos);
AttFileEO byId = iAttFileEOService.getFileInfo(idInfo); if(sarBussStandAttrInfo!=null && StringUtils.isNotBlank(sarBussStandAttrInfo.getFbgbuss())){
if(StringUtils.isNotBlank(fbgbussNmae)){ String[] splitInfo = sarBussStandAttrInfo.getFbgbuss().split(",");
fbgbussNmae = fbgbussNmae+","+byId.getOldFileName(); String fbgbussName = "";
}else { String fbgBuss = "";
fbgbussNmae = byId.getOldFileName(); for(String idInfo :splitInfo){
} if(StringUtils.isNotBlank(idInfo)) {
} AttFileEO byId = iAttFileEOService.getFileInfo(idInfo);
sarBussStandAttrInfo.setFbgbussNmae(fbgbussNmae); if (StringUtils.isNotBlank(fbgbussName)) {
sarBussStandAttrInfoList.add(sarBussStandAttrInfo); fbgbussName = fbgbussName + "," + byId.getOldFileName();
} else {
fbgbussName = byId.getOldFileName();
}
if (StringUtils.isNotBlank(fbgBuss)) {
fbgBuss = fbgBuss + "," + byId.getId();
} else {
fbgBuss = byId.getId();
}
}
}
sarBussStandAttrInfo.setFbgbussNmae(fbgbussName);
sarBussStandAttrInfo.setFbgbuss(fbgBuss);
sarBussStandAttrInfoList.add(sarBussStandAttrInfo);
}
}
}
} }
return Result.success(sarBussStandAttrInfoList); return Result.success(sarBussStandAttrInfoList);
} }