From 26cc95e827cd6893cc23474690e2487bb282beff Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Tue, 12 Nov 2024 11:24:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E7=9C=8B=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E9=80=9F=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/custom/CarMainMapper.xml |  4 +-
 .../impl/RepairRecordsServiceImpl.java        |  6 +--
 .../impl/DlRepairTicketsServiceImpl.java      |  2 +-
 .../mapper/base/RepairRecordsMapper.xml       | 42 ++++++++++++++++---
 4 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/dl-module-base/src/main/resources/mapper/custom/CarMainMapper.xml b/dl-module-base/src/main/resources/mapper/custom/CarMainMapper.xml
index 11b4ffd0..6cffa5c4 100644
--- a/dl-module-base/src/main/resources/mapper/custom/CarMainMapper.xml
+++ b/dl-module-base/src/main/resources/mapper/custom/CarMainMapper.xml
@@ -85,12 +85,10 @@
         SELECT
         <include refid="baseCarMainColumn"></include>,
         bcb.brand_name AS brandStr,
-        bcb.logo_img AS logoImg,
-        bcm.model_name AS modelStr
+        bcb.logo_img AS logoImg
         FROM
             `base_car_main` tbcm
             LEFT JOIN base_car_brand bcb ON bcb.deleted = 0 AND tbcm.car_brand = bcb.id
-            LEFT JOIN base_car_model bcm ON bcm.deleted = 0 AND tbcm.car_model = bcm.id
         WHERE
             tbcm.deleted = 0
         AND
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairRecordsServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairRecordsServiceImpl.java
index db3ad74a..fde8d479 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairRecordsServiceImpl.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairRecordsServiceImpl.java
@@ -26,8 +26,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import static cn.iocoder.yudao.common.BaseConstants.REPAIR_RECORD_TYPE_RECORD;
-
 /**
  * 维修记录 Service 实现类
  *
@@ -106,10 +104,8 @@ public class RepairRecordsServiceImpl extends ServiceImpl<RepairRecordsMapper, R
             } else {
                 item.setRoleName(getRoleName(userRoleMap.get(item.getDealUserId())));
             }
-            List<RepairRecordsItem> itemList = itemService.getByMainId(REPAIR_RECORD_TYPE_RECORD, item.getId(), pageReqVO.getIsOpen());
-            item.setItemList(itemList);
             //相对路径按照“，”分隔
-            item.setImages(itemList.stream().map(RepairRecordsItem::getImage).collect(Collectors.joining(",")));
+            item.setImages(item.getItemList().stream().map(RepairRecordsItem::getImage).collect(Collectors.joining(",")));
         });
         return list;
     }
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
index 6f0b41ab..a4605b3e 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
@@ -342,7 +342,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
         }
 
         //查用户信息
-        CustomerMain customerInfo = customerService.getCustomerById(dlRepairTickets.getUserId());
+        CustomerMain customerInfo = customerService.getById(dlRepairTickets.getUserId());
         result.setCustomerInfo(customerInfo);
         // 查工单子表
         List<DlRepairTitem> itemList = titemService.list(new LambdaQueryWrapper<DlRepairTitem>().eq(DlRepairTitem::getTicketId, id));
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 83ecb10f..6b9f4cee 100644
--- a/dl-module-repair/src/main/resources/mapper/base/RepairRecordsMapper.xml
+++ b/dl-module-repair/src/main/resources/mapper/base/RepairRecordsMapper.xml
@@ -8,14 +8,43 @@
         代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
-
-    <select id="queryRepairRecords" resultType="cn.iocoder.yudao.module.base.vo.RepairRecordsRespVO">
+    <resultMap id="baseResultMap" type="cn.iocoder.yudao.module.base.vo.RepairRecordsRespVO">
+        <id column="id" property="id"/>
+        <result column="ticket_id" property="ticketId"/>
+        <result column="repair_item_id" property="repairItemId"/>
+        <result column="type" property="type"/>
+        <result column="remark" property="remark"/>
+        <result column="deal_user_name" property="dealUserName"/>
+        <result column="deal_user_id" property="dealUserId"/>
+        <result column="creator" property="creator"/>
+        <result column="create_time" property="createTime"/>
+        <collection property="itemList" ofType="cn.iocoder.yudao.module.base.entity.RepairRecordsItem" columnPrefix="item_">
+            <id column="id" property="id"/>
+            <result column="record_id" property="recordId"/>
+            <result column="ticket_id" property="ticketId"/>
+            <result column="repair_item_id" property="repairItemId"/>
+            <result column="remark" property="remark"/>
+            <result column="image" property="image"/>
+            <result column="is_open" property="isOpen"/>
+            <result column="create_time" property="createTime"/>
+        </collection>
+    </resultMap>
+    <select id="queryRepairRecords" resultMap="baseResultMap">
         SELECT main.*,
-               drt.item_name AS projectName
+               drt.item_name AS projectName,
+                drri.id AS item_id,
+                drri.record_id AS item_record_id,
+                drri.ticket_id AS item_ticket_id,
+                drri.repair_item_id AS item_repair_item_id,
+                drri.remark AS item_remark,
+                drri.image AS item_image,
+                drri.is_open AS item_is_open,
+                drri.create_time AS item_create_time
         FROM dl_repair_records main
         LEFT JOIN dl_repair_titem drt ON main.repair_item_id = drt.id AND drt.deleted = 0
+        LEFT JOIN dl_repair_records_item drri ON main.id = drri.record_id
         <where>
-            main.deleted = '0'
+            main.deleted = '0' AND drri.deleted = '0'
             <if test="entity.ticketId != null and entity.ticketId != ''">
                 AND main.ticket_id = #{entity.ticketId}
             </if>
@@ -28,8 +57,11 @@
             <if test="entity.type != null and entity.type != ''">
                 AND main.type = #{entity.type}
             </if>
+            <if test="entity.isOpen != null and entity.isOpen != ''">
+                AND drri.is_open = #{entity.type}
+            </if>
         </where>
-        order by main.create_time desc
+        order by main.create_time desc,drri.create_time
     </select>
     <select id="selectNowRepairByTicketId" resultType="java.util.Map">
         SELECT