From a6c94c1c523233fca2510fb6654f695c3bd50b23 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Tue, 23 May 2023 14:02:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=96=87=E4=BB=B6=20=E5=9C=A8=E5=9B=BD=E5=86=85=20=E6=B5=B7?= =?UTF-8?q?=E5=A4=96=20=E4=BC=81=E4=B8=9A=20=E7=9A=84=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E4=B8=AD=E8=BF=9B=E8=A1=8C=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarBussionessStandServiceImpl.java | 32 +++++++++++++++++++ .../impl/SarStandardsInfoServiceImpl.java | 32 +++++++++++++++++++ 2 files changed, 64 insertions(+) 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) { From 617d6f81c4e2a4698f8817b43595e973024d37d1 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Tue, 23 May 2023 14:04:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarBussionessStandController.java | 13 ------------- 1 file changed, 13 deletions(-) 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); }