From 37da64ff159b0bf8c5d96e37453a9706972e34be Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Mon, 26 May 2025 16:31:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=A6=96=E9=A1=B5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/jx/DriveSchoolCarMapper.xml     | 12 ++++++------
 .../src/main/resources/mapper/train/TrainMapper.xml  |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCarMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCarMapper.xml
index a5ad8457..8d4a4245 100644
--- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCarMapper.xml
+++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolCarMapper.xml
@@ -102,11 +102,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="selectTrainCar" resultType="cn.iocoder.yudao.module.jx.domain.DriveSchoolCar">
         SELECT
-        dsc.*
+        dscc.*
         FROM
-        drive_school_car dsc
-        LEFT JOIN drive_school_train dst ON dsc.user_id = dst.coach_id
-        AND dst.deleted = 0
+        drive_school_train dst
+        LEFT JOIN drive_school_coach dsc ON dst.coach_id = dsc.user_id AND dst.deleted = 0
+        LEFT JOIN drive_school_car dscc ON dsc.car_id = dscc.car_no
         WHERE
         dst.id IS NOT NULL
         AND dsc.deleted = 0
@@ -117,7 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND dsc.car_no LIKE CONCAT('%',#{searchValue},'%')
         </if>
         <if test="courseType != null and courseType != ''">
-            AND dsc.course_type =#{courseType}
+            AND dscc.course_type =#{courseType}
         </if>
         <if test="startTime!=null and startTime!=''">
             AND dst.create_time &gt;= #{startTime}
@@ -126,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND dst.create_time &lt;= #{endTime}
         </if>
         GROUP BY
-        dsc.id
+        dscc.id
     </select>
 
 
diff --git a/dl-module-jx/src/main/resources/mapper/train/TrainMapper.xml b/dl-module-jx/src/main/resources/mapper/train/TrainMapper.xml
index c2012c5d..39a141e3 100644
--- a/dl-module-jx/src/main/resources/mapper/train/TrainMapper.xml
+++ b/dl-module-jx/src/main/resources/mapper/train/TrainMapper.xml
@@ -34,7 +34,7 @@
     <select id="selectTrainByCondition" resultType="cn.iocoder.yudao.module.train.vo.TrainVO">
         SELECT
             dst.*,
-            dsc.car_id
+            dsc.car_id AS carNo
         FROM
             drive_school_train dst
                 LEFT JOIN drive_school_coach dsc ON dst.coach_id = dsc.user_id