From 33d5ee1583c5e6b0387192f717c07d2953469c85 Mon Sep 17 00:00:00 2001
From: maxiangong <298222784@qq.com>
Date: Thu, 28 May 2026 17:17:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E5=AD=90=E6=A1=A3=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/produce/mapper/WorkPlanMapper.xml    | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml
index badf5c11b..bc5418bee 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml
@@ -294,17 +294,33 @@
 
 
     <select id="getByRfpsId" resultType="org.springblade.desk.produce.pojo.dto.MesRbFilePreserveDetailDTO">
-        select * ,slot.rfps_type as rfpsType from MES_RB_FILE_PRESERVE_DETAIL a
-                                                      inner join MES_RB_FILE_PRESERVE_SLOT slot on a.rfps_id = slot.rfp_id
+        select DISTINCT
+               a.RFPS_ID as rfpsId,
+               a.DETAIL_NAME as detailName,
+               a.DETAIL_INDEX as detailIndex,
+               a.ASK,
+               a.RFPD_TIME as rfpdTime,
+               a.QUALIFIED,
+               a.PARAM_NAME as paramName,
+               a.PARAM_VALUE as paramValue,
+             slot.rfps_type as rfpsType
+        from MES_RB_FILE_PRESERVE_DETAIL a
+        inner join MES_RB_FILE_PRESERVE_SLOT slot on a.rfps_id = slot.rfp_id
         where slot.rfp_id =#{rfpsId}
-
+        order by a.DETAIL_INDEX asc
     </select>
 
 
     <select id="getByRfpId" resultType="org.springblade.desk.produce.pojo.entity.MesRbFilePreserveSlotEntity">
-        select a.*  from MES_RB_FILE_PRESERVE_SLOT slot
---         left join DS_RB_FILE_PRESERVE slot on a.Id = slot.RFP_ID
-                             inner join QA_PRO_RE_TEMPLATE a on a.Id = slot.RFP_ID
+        select slot.RFP_ID as rfpId,
+               slot.SLOT_NAME as slotName,
+               slot.SLOT_INDEX as slotIndex,
+               slot.INSERT_INDEX as insertIndex,
+               slot.RFPS_TYPE as rfpsType,
+               slot.KEEP_TIME as keepTime,
+               slot.KEEP_MAN as keepMan
+               from MES_RB_FILE_PRESERVE_SLOT slot
+               inner join QA_PRO_RE_TEMPLATE a on a.Id = slot.RFP_ID
         where slot.RFP_ID =#{rfpId}
 
     </select>