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 2225ecaf..f5776d63 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 @@ -2754,10 +2754,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl SarBussionessStandList = sarBussionessStandEODao.selectListInfo(); - // List SarStandardsInfoList = sarStandardsInfoDao.selectListInfo(); - // 获取 kmpro_addon34 表的 lore_doc_id - List oldSystemInfoList = sarStandardsInfoDao.selectOldSystemInfo(); //数据组合 List oldArr = new ArrayList(); List oldArr1 = new ArrayList(); @@ -2767,8 +2763,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl SarStandardsInfoList = sarStandardsInfoDao.selectListInfo(); for (OldSystem SarStandardsInfo : SarStandardsInfoList) { - for (OldSystem oldSystem : oldSystemInfoList) { if (StringUtils.isNotBlank(SarStandardsInfo.getBuildId())) { + OldSystem oldSystem = sarStandardsInfoDao.selectOldSystemInfoByBuidId(SarStandardsInfo.getBuildId()); if (oldSystem.getLoreDocId().equals(SarStandardsInfo.getBuildId())) { //通过,号分割文件,通过id去查询文件 获取文件名称 if (StringUtils.isNotBlank(SarStandardsInfo.getFileId())) { @@ -2827,7 +2823,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl SarBussionessStandList = sarBussionessStandEODao.selectListInfo(); //企业的文件数据处理 - for (OldSystem sarBussionessStand : SarBussionessStandList){ - for (OldSystem oldSystem : oldSystemInfoList) { + for (OldSystem sarBussionessStand: SarBussionessStandList){ + // 通过 关联id 去查询这条数据 查询到 即当前数据 if(StringUtils.isNotBlank(sarBussionessStand.getBuildId())){ + OldSystem oldSystem = sarStandardsInfoDao.selectOldSystemInfoByBuidId(sarBussionessStand.getBuildId()); if(oldSystem.getLoreDocId().equals(sarBussionessStand.getBuildId())) { //通过,号分割文件,通过id去查询文件 获取文件名称 if(StringUtils.isNotBlank(sarBussionessStand.getFileId())){ @@ -2909,7 +2905,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl { List dealWithDS(@Param("type") String standType, @Param("status")List strings); - List selectOldSystemInfo(); - List selectListInfo(); List OldSystemFile(@Param("loreDocId") String loreDocId); @@ -111,4 +109,6 @@ public interface SarStandardsInfoDao extends BaseMapper { List selectOldSystemFileBuildId(@Param("buildId") String buildId); OldSystem loreDepotSort(@Param("sortId") String sortId); + + OldSystem selectOldSystemInfoByBuidId(@Param("buildId") String buildId); } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 9900c0cc..59ffed22 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -1888,13 +1888,6 @@ - - + + + +