From a0829f5ede21ff2b8e7a1130181d9ed0778962e4 Mon Sep 17 00:00:00 2001
From: SUNJIABIN <sunjiabin0907@163.com>
Date: Fri, 7 Apr 2023 19:13:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8B=86=E5=88=86=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SarStandItemsServiceImpl.java              | 6 ++----
 .../da/slrs/standardSplit/dao/SarFileSplitInfoEODao.java    | 1 +
 .../da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java   | 2 +-
 .../mapper/standardSplit/SarFileSplitInfoEOMapper.xml       | 4 ++++
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java
index 3aa67767..dc737bb1 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java
@@ -377,15 +377,13 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
      * @return
      */
     public Map<String,Object> selectSarItemAndInterpretation(String standId)throws Exception {
-        QueryWrapper<SarFileSplitInfoEO> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("STAND_ID",standId);
-        List<SarFileSplitInfoEO> sarFileSplitInfoEO = sarFileSplitInfoEODao.selectList(queryWrapper);
+        List<SarFileSplitInfoEO> sarFileSplitInfoEO = sarFileSplitInfoEODao.selectByStandId(standId);
 
         for (SarFileSplitInfoEO data : sarFileSplitInfoEO){
             String idInfo = data.getId();
             SarFileSplitItemsEOPage page = new SarFileSplitItemsEOPage();
             String id = sarFileSplitMenuEOService.selectByInfoId(idInfo);
-            page.setId(id);
+            page.setInfoId(id);
             //ValidFlag为0的意思是有效，设置这个文件分解清单的有效性为有效
             page.setValidFlag("0");
             //把SAR_FILE_SPLIT_MENU表里的数据按照display_seq的从小到大的正序进行排列
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitInfoEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitInfoEODao.java
index 1b0855b8..e39c441e 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitInfoEODao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitInfoEODao.java
@@ -39,4 +39,5 @@ public interface SarFileSplitInfoEODao extends BaseMapper<SarFileSplitInfoEO> {
 
     List<SarFileSplitItemsEO> querySame (SarFileSplitInfoEO sarFileSplitInfoEO);
 
+    List<SarFileSplitInfoEO> selectByStandId(String standId);
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java
index 1a1f00fe..d364a74c 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java
@@ -61,6 +61,6 @@ public interface SarFileSplitItemsEODao extends BaseMapper<SarFileSplitItemsEO>
 
    int deleteByPrimaryKey(String id);
 
-   @Select("select ID from sar_file_split_info where  INFO_ID=#{infoId}")
+   @Select("select ID from sar_file_split_info where ID=#{infoId}")
     String selectByInfoId(String infoId);
 }
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml
index 4e35dfba..cf66869b 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml
@@ -340,4 +340,8 @@
         where SAR_FILE_SPLIT_INFO.ID = #{id}
     </select>
 
+    <select id="selectByStandId" resultType="com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEO">
+        select * from sar_file_split_info where stand_id = #{standId}
+    </select>
+
 </mapper>