diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index 9cb8e45a..ebffc100 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -364,19 +364,6 @@ public class SarBussionessStandController extends BaseController attrInfoMap = result.getAttrInfoMap(); -// if(!attrInfoMap.isEmpty()){ -// Object fbgbuss = attrInfoMap.get("FBGBUSS"); -// Object fbgbussName = attrInfoMap.get("FBGBUSSName"); -// if(fbgbuss != null ){ -// result.getAttrInfoMap().put("LSBBBUSS",fbgbuss.toString()); -// result.getAttrInfoMap().put("FBGBUSS",null); -// } -// if(fbgbussName != null ){ -// result.getAttrInfoMap().put("LSBBBUSSName",fbgbussName.toString()); -// result.getAttrInfoMap().put("FBGBUSSName",null); -// } -// } return Result.success(result); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 51668546..1e90684d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -1913,6 +1913,38 @@ public class SarBussionessStandServiceImpl extends ServiceImpl getAttrMap = sarBussStandAttrInfoEODao.selectStandFieldAndData(fieldInfo,row.getId()); + if(getAttrMap.get("FBGBUSS")!=null){ + if(org.apache.commons.lang3.StringUtils.isNotBlank(getAttrMap.get("FBGBUSS").toString())){ + String[] split = getAttrMap.get("FBGBUSS").toString().split(","); + String fileId = ""; + for (String id :split){ + if(id.contains("ATT_FILE_")){ + //则是正规数据 + if(org.apache.commons.lang3.StringUtils.isNotBlank(fileId)){ + fileId = fileId+","+ id; + }else { + fileId = id; + } + }else { + //加工数据 + QueryWrapper onlineFileLogQueryWrapper = new QueryWrapper<>(); + onlineFileLogQueryWrapper.eq("HIS_ID",id); + onlineFileLogQueryWrapper.orderByDesc("CREATE_TIME"); + List onlineFileLogs = onlineFileLogDao.selectList(onlineFileLogQueryWrapper); + if(!onlineFileLogs.isEmpty()){ + if(org.apache.commons.lang3.StringUtils.isNotBlank(fileId)){ + fileId = fileId+","+onlineFileLogs.get(0).getAttFileId(); + }else { + fileId = onlineFileLogs.get(0).getAttFileId(); + } + } + } + + } + Object obj = fileId; + getAttrMap.put("FBGBUSS",obj); + } + } if (InitStandAttrUtil.clobFieldListBuss != null && !InitStandAttrUtil.clobFieldListBuss.isEmpty()) { // 遍历修改所有clob类型的值 for (String clobField : InitStandAttrUtil.clobFieldListBuss) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index ebdcde31..2cbfa753 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -760,6 +760,38 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getAttrMap = sarStandAttrInfoEODao.selectStandFieldAndData(fieldInfo, row.getId()); + if(getAttrMap.get("FBGBJBD")!=null){ + if(StringUtils.isNotBlank(getAttrMap.get("FBGBJBD").toString())){ + String[] split = getAttrMap.get("FBGBJBD").toString().split(","); + String fileId = ""; + for (String id :split){ + if(id.contains("ATT_FILE_")){ + //则是正规数据 + if(StringUtils.isNotBlank(fileId)){ + fileId = fileId+","+ id; + }else { + fileId = id; + } + }else { + //加工数据 + QueryWrapper onlineFileLogQueryWrapper = new QueryWrapper<>(); + onlineFileLogQueryWrapper.eq("HIS_ID",id); + onlineFileLogQueryWrapper.orderByDesc("CREATE_TIME"); + List onlineFileLogs = onlineFileLogDao.selectList(onlineFileLogQueryWrapper); + if(!onlineFileLogs.isEmpty()){ + if(StringUtils.isNotBlank(fileId)){ + fileId = fileId+","+onlineFileLogs.get(0).getAttFileId(); + }else { + fileId = onlineFileLogs.get(0).getAttFileId(); + } + } + } + + } + Object obj = fileId; + getAttrMap.put("FBGBJBD",obj); + } + } if (InitStandAttrUtil.clobFieldList != null && !InitStandAttrUtil.clobFieldList.isEmpty()) { // 遍历修改所有clob类型的值 for (String clobField : InitStandAttrUtil.clobFieldList) {