From 082330c4a2a4ab62714e8e1f83d47469b99ca3ba Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Tue, 2 Sep 2025 11:53:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repair/RepairInputDetailsMapper.xml       | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml
index 4e1c3f66..5098349d 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml
@@ -32,15 +32,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
         rd.task_id AS taskId,
         tt1.CODE AS repairCode,
-        null     AS backCode,
+        bai.`code` AS backCode,
         rd.create_time AS createTime,
         tt.task_status AS taskStatus,
         CASE tt.task_status
-            WHEN '0' THEN '入库进行中'
-            WHEN '1' THEN '入库完成'
-            WHEN '2' THEN '入库驳回'
-            ELSE '未知状态'
-            END AS statusName,
+        WHEN '0' THEN '入库进行中'
+        WHEN '1' THEN '入库完成'
+        WHEN '2' THEN '入库驳回'
+        ELSE '未知状态'
+        END AS statusName,
         rd.remark AS remark,
         bui.unit_name AS backUnit,
         bpi.pro_name AS backPro,
@@ -57,6 +57,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN ma_type mt2 on mt.parent_id = mt2.type_id
         LEFT JOIN tm_task tt on rd.task_id = tt.task_id
         LEFT JOIN tm_task tt1 on rd.repair_id = tt1.task_id
+
+        LEFT JOIN repair_apply_details rad ON rad.task_id = rd.repair_id
+        LEFT JOIN back_apply_info bai ON rad.back_id = bai.id
         LEFT JOIN tm_task_agreement tta ON rd.repair_id = tta.task_id
         LEFT JOIN bm_agreement_info bai2 ON tta.agreement_id = bai2.agreement_id
         LEFT JOIN bm_unit bui ON bai2.unit_id = bui.unit_id
@@ -68,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             JOIN ma_type_keeper mtr ON mtr.type_id = rd.type_id AND mtr.user_id = #{userId}
         </if>
         <where>
-            rd.create_time &lt; '2025-08-20 00:00:00'
+            rad.create_time &lt; '2025-08-20 00:00:00'
             <if test="inputCode != null and inputCode != ''">
                 AND tt.CODE = #{inputCode}
             </if>
@@ -121,7 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             JOIN ma_type_keeper mtr ON mtr.type_id = rd.type_id AND mtr.user_id = #{userId}
         </if>
         <where>
-            rd.create_time &gt;= '2025-08-20 00:00:00'
+            rad.create_time &gt;= '2025-08-20 00:00:00'
             <if test="inputCode != null and inputCode != ''">
                 AND tt.CODE = #{inputCode}
             </if>
@@ -133,7 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ) AS combined_results
         ORDER BY
         taskStatus,
-        createTime DESC;
+        createTime DESC
     </select>
 
     <select id="selectRepairInputDetailsById" resultType="com.bonus.material.repair.domain.RepairInputInfo">