From 97edaf40466ba62b2653669edfddf725a04415e1 Mon Sep 17 00:00:00 2001
From: PQZ <pangqingzhou@gmail.com>
Date: Tue, 5 Nov 2024 14:12:20 +0800
Subject: [PATCH] 1

---
 .../module/base/vo/RepairRecordsRespVO.java    |  3 ++-
 .../mapper/base/RepairRecordsMapper.xml        | 18 ++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/vo/RepairRecordsRespVO.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/vo/RepairRecordsRespVO.java
index c6498082..9d62e221 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/vo/RepairRecordsRespVO.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/vo/RepairRecordsRespVO.java
@@ -18,5 +18,6 @@ public class RepairRecordsRespVO extends RepairRecords {
     private String images;
     /**角色、岗位名称*/
     private String roleName;
-
+    /**项目名称*/
+    private String projectName;
 }
diff --git a/dl-module-repair/src/main/resources/mapper/base/RepairRecordsMapper.xml b/dl-module-repair/src/main/resources/mapper/base/RepairRecordsMapper.xml
index 639bcf69..83ecb10f 100644
--- a/dl-module-repair/src/main/resources/mapper/base/RepairRecordsMapper.xml
+++ b/dl-module-repair/src/main/resources/mapper/base/RepairRecordsMapper.xml
@@ -10,24 +10,26 @@
      -->
 
     <select id="queryRepairRecords" resultType="cn.iocoder.yudao.module.base.vo.RepairRecordsRespVO">
-        SELECT *
-        FROM dl_repair_records
+        SELECT main.*,
+               drt.item_name AS projectName
+        FROM dl_repair_records main
+        LEFT JOIN dl_repair_titem drt ON main.repair_item_id = drt.id AND drt.deleted = 0
         <where>
-            deleted = '0'
+            main.deleted = '0'
             <if test="entity.ticketId != null and entity.ticketId != ''">
-                AND ticket_id = #{entity.ticketId}
+                AND main.ticket_id = #{entity.ticketId}
             </if>
             <if test="entity.repairItemId != null and entity.repairItemId != ''">
-                AND repair_item_id = #{entity.repairItemId}
+                AND main.repair_item_id = #{entity.repairItemId}
             </if>
             <if test="entity.dealUserId != null and entity.dealUserId != ''">
-                AND deal_user_id = #{entity.dealUserId}
+                AND main.deal_user_id = #{entity.dealUserId}
             </if>
             <if test="entity.type != null and entity.type != ''">
-                AND type = #{entity.type}
+                AND main.type = #{entity.type}
             </if>
         </where>
-        order by create_time desc
+        order by main.create_time desc
     </select>
     <select id="selectNowRepairByTicketId" resultType="java.util.Map">
         SELECT