From 8e89954509a0a29108be899737b1d855f471eb84 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 18 Nov 2025 13:52:49 +0800
Subject: [PATCH] =?UTF-8?q?2025-11-18=20ECN=E6=89=80=E9=80=89=E6=8A=80?=
 =?UTF-8?q?=E6=9C=AF=E5=8F=82=E6=95=B0=E5=8D=A1BU=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/ChangeRequestDetailEntity.java     |  3 ++
 .../change/mapper/ChangeManagementMapper.java |  2 ++
 .../impl/ChangeManagementServiceImpl.java     |  4 +--
 .../change/vo/ChangeRequestDetailVo.java      |  4 ---
 .../mapper/change/ChangeManagementMapper.xml  | 30 ++++++++++++++++++-
 5 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/spring/modules/change/entity/ChangeRequestDetailEntity.java b/src/main/java/com/spring/modules/change/entity/ChangeRequestDetailEntity.java
index 4969e93f..48bac871 100644
--- a/src/main/java/com/spring/modules/change/entity/ChangeRequestDetailEntity.java
+++ b/src/main/java/com/spring/modules/change/entity/ChangeRequestDetailEntity.java
@@ -92,4 +92,7 @@ public class ChangeRequestDetailEntity extends QueryPage implements Serializable
 
     @TableField(exist = false)
     private String ifsPartNo;
+
+    @TableField(exist = false)
+    private String testPartNo;
 }
diff --git a/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java b/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java
index 09ffb751..2b1aa8ca 100644
--- a/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java
+++ b/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java
@@ -212,4 +212,6 @@ public interface ChangeManagementMapper extends BaseMapper<ChangeRequestEntity>{
     List<PlmChangeTeam> selectChangeTeam(@Param("site") String site, @Param("changeNo") String changeNo);
 
     List<ChangeDelegateAccess> searchDelegateAccess(@Param("site") String site, @Param("changeNo") String changeNo, @Param("type") String type);
+
+    List<ChangeRequestDetailEntity> requestDetailSearch2(ChangeRequestEntity inData);
 }
diff --git a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
index 3ebf2316..6ff2b10d 100644
--- a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
+++ b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
@@ -210,7 +210,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
         ChangeRequestEntity inData = new ChangeRequestEntity();
         inData.setSite(data.getSite());
         inData.setChangeNo(changeNo);
-        List<ChangeRequestDetailEntity> chooseDataList = changeManagementMapper.requestDetailSearch(inData);
+        List<ChangeRequestDetailEntity> chooseDataList = changeManagementMapper.requestDetailSearch2(inData);
         HashMap<String, Object> map = new HashMap<>();
         map.put("changeNo", changeNo);
         map.put("chooseDataList", chooseDataList);
@@ -405,7 +405,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
      */
     @Override
     public List<ChangeRequestDetailEntity> requestDetailSearch(ChangeRequestEntity data) {
-        List<ChangeRequestDetailEntity> list = changeManagementMapper.requestDetailSearch(data);
+        List<ChangeRequestDetailEntity> list = changeManagementMapper.requestDetailSearch2(data);
         return list;
     }
 
diff --git a/src/main/java/com/spring/modules/change/vo/ChangeRequestDetailVo.java b/src/main/java/com/spring/modules/change/vo/ChangeRequestDetailVo.java
index b441d627..8ea1be58 100644
--- a/src/main/java/com/spring/modules/change/vo/ChangeRequestDetailVo.java
+++ b/src/main/java/com/spring/modules/change/vo/ChangeRequestDetailVo.java
@@ -10,8 +10,4 @@ import java.util.List;
 public class ChangeRequestDetailVo extends ChangeRequestDetailEntity {
 
     private String oriCodeNo;
-
-    private String plmPartNo;
-
-    private String ifsPartNo;
 }
diff --git a/src/main/resources/mapper/change/ChangeManagementMapper.xml b/src/main/resources/mapper/change/ChangeManagementMapper.xml
index a1c75351..3836c1b4 100644
--- a/src/main/resources/mapper/change/ChangeManagementMapper.xml
+++ b/src/main/resources/mapper/change/ChangeManagementMapper.xml
@@ -261,7 +261,8 @@
         a.update_date,
         a.update_by,
         b.ori_code_no,
-        p.plm_part_no
+        p.plm_part_no,
+        p.plm_part_no as testPartNo
         FROM plm_change_request_detail a
         left join plm_technical_specification_sheet as b on a.site = b.site and a.code_no = b.code_no
         left join part as p on a.site = p.site and a.part_no = p.ifs_part_no and p.show_in_query_flag = 'Y'
@@ -614,6 +615,33 @@
         where a.site = #{site} and a.change_no = #{changeNo}
     </select>
 
+    <!-- 查询变更明细 -->
+    <select id="requestDetailSearch2" parameterType="com.spring.modules.change.entity.ChangeRequestEntity" resultType="com.spring.modules.change.entity.ChangeRequestDetailEntity">
+        SELECT
+            a.site,
+            c.bu_no,
+            a.change_no,
+            a.code_no,
+            a.rev_no,
+            a.part_no,
+            a.part_desc,
+            a.drawing_no,
+            a.draft_no,
+            a.new_part_no,
+            a.new_drawing_no,
+            a.new_draft_no,
+            a.create_date,
+            a.create_by,
+            a.update_date,
+            a.update_by,
+            b.plm_part_no as testPartNo,
+            b.ifs_part_no
+        FROM plm_change_request_detail as a
+        left join plm_change_request as c on a.site = c.site and a.change_no = c.change_no
+        left join part as b on a.site = b.site and a.part_no = b.ifs_part_no and b.show_in_query_flag ='Y'
+        where a.site = #{site} and a.change_no = #{changeNo}
+    </select>
+
     <!-- 删除变更明细 -->
     <delete id="deleteChangeDetail" parameterType="ChangeRequestDetailEntity">
         delete from plm_change_request_detail