diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/OldSystem.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/OldSystem.java index 849776d6..d884980b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/OldSystem.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/OldSystem.java @@ -15,6 +15,8 @@ public class OldSystem { private String fileSrc; //lore_depot_sort private String sortSign; + //lore_attache + private String ext; //新系统返回数据所需要的 private String attfid; 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 1c72f904..f527f945 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 @@ -3329,7 +3329,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl loreAttacheList= sarStandardsInfoDao.selectOldSystemFileBuildId(buildId); + /* List loreAttacheList= sarStandardsInfoDao.selectOldSystemFileBuildId(buildId); if(loreAttacheList.size()>0){ for (OldSystem src : loreAttacheList) { if(StringUtils.isNotBlank(src.getFileSrc())){ @@ -3345,6 +3345,18 @@ public class SarBussionessStandServiceImpl extends ServiceImpl loreAttacheList= sarStandardsInfoDao.selectOldSystemFileBuildId(buildId); + if(loreAttacheList.size()>0){ + for (OldSystem src : loreAttacheList) { + if(StringUtils.isNotBlank(src.getFileSign()) && StringUtils.isNotBlank(src.getExt())){ + String s = src.getFileSign()+"."+src.getExt(); + if (s.equals(oldFileName)){ + return "1"; + } + } + } + } return "-1"; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandAttrInfo/SarStandAttrInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandAttrInfo/SarStandAttrInfoMapper.xml index de2d245a..6994a345 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandAttrInfo/SarStandAttrInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandAttrInfo/SarStandAttrInfoMapper.xml @@ -242,8 +242,8 @@ - update SAR_STAND_ATTR_INFO set FBGBJBD = #{fbgbjbd}, TRANSLATION = #{translation} - where stand_id = #{standId} + update SAR_STAND_ATTR_INFO ss set ss.FBGBJBD = #{fbgbjbd}, ss.TRANSLATION = #{translation} + where id = #{id} SELECT - lo.Src as 'fileSrc' + lo.Src as 'fileSrc', + lo.Sign as 'fileSign', + lo.Ext as 'ext' from lore_attache lo where 1=1