From 859326d2a3524d25d23cefad4dbd5d4fa8653190 Mon Sep 17 00:00:00 2001
From: gaojiabao <syxy@soft.com>
Date: Mon, 13 Mar 2023 15:07:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=91=E6=96=87=E5=8E=9F=E6=96=87=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=88=E8=BF=94=E5=9B=9E=E6=96=87=E4=BB=B6=E6=9C=89?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E9=87=8D=E5=A4=8D,=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SarBussionessStandServiceImpl.java   | 13 +++------
 .../dao/SarStandardsInfoDao.java              |  4 +--
 .../SarStandardsInfoMapper.xml                | 28 ++++++++++++++-----
 3 files changed, 27 insertions(+), 18 deletions(-)

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<SarBussionessStan
         //
     @Override
     public ResponseMessage emptyFileAnewStorage(String type) {
-        //List<OldSystem> SarBussionessStandList = sarBussionessStandEODao.selectListInfo();
-       // List<OldSystem> SarStandardsInfoList = sarStandardsInfoDao.selectListInfo();
-        // 获取 kmpro_addon34 表的 lore_doc_id
-        List<OldSystem> oldSystemInfoList = sarStandardsInfoDao.selectOldSystemInfo();
         //数据组合
         List<OldSystem> oldArr = new ArrayList();
         List<OldSystem> oldArr1 = new ArrayList();
@@ -2767,8 +2763,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
         if(type.equals("海外")) {
             List<OldSystem> 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<SarBussionessStan
                             }
                         }
                     }
-                }
             }
             //海外 国内
             for(OldSystem data : oldArr) {
@@ -2846,9 +2841,10 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
         if(type.equals("企业")){
             List<OldSystem> 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<SarBussionessStan
                             }
                         }
                     }
-                }
             }
             // 企业
             for(OldSystem data : oldArr1) {
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java
index 786e3629..6e66bd87 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java
@@ -100,8 +100,6 @@ public interface SarStandardsInfoDao extends BaseMapper<SarStandardsInfo> {
 
     List<DSarStandardDTO> dealWithDS(@Param("type") String standType, @Param("status")List<String> strings);
 
-    List<OldSystem> selectOldSystemInfo();
-
     List<OldSystem> selectListInfo();
 
     List<OldSystem> OldSystemFile(@Param("loreDocId") String loreDocId);
@@ -111,4 +109,6 @@ public interface SarStandardsInfoDao extends BaseMapper<SarStandardsInfo> {
     List<OldSystem> 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 @@
         </where>
     </select>
 
-    <select id="selectOldSystemInfo" resultType="com.adc.da.slrs.sarBussionessStand.entity.OldSystem">
-        SELECT
-        km.lore_doc_id as 'loreDocId',
-        km.sort_id as 'sortId'
-        from kmpro_addon34 km
-    </select>
-
     <select id="selectListInfo" resultType="com.adc.da.slrs.sarBussionessStand.entity.OldSystem">
         SELECT
         std.id as 'standId',
@@ -1946,4 +1939,25 @@
         </if>
     </select>
 
+    <select id="loreDepotSort" resultType="com.adc.da.slrs.sarBussionessStand.entity.OldSystem">
+        SELECT
+        lo.Sign as 'sortSign'
+        from lore_depot_sort lo
+        where 1=1
+        <if test="sortId != null">
+            and  lo.id = #{sortId}
+        </if>
+    </select>
+
+    <select id="selectOldSystemInfoByBuidId" resultType="com.adc.da.slrs.sarBussionessStand.entity.OldSystem">
+        SELECT
+        km.lore_doc_id as 'loreDocId',
+        km.sort_id as 'sortId'
+        from kmpro_addon34 km
+        where 1=1
+        <if test="buildId != null">
+            and  km.lore_doc_id = #{buildId}
+        </if>
+    </select>
+
 </mapper>