From 3e66678b5dcf3c825a1e4c30db9a419d33c2da3f Mon Sep 17 00:00:00 2001
From: PQZ <pangqingzhou@gmail.com>
Date: Wed, 19 Feb 2025 18:12:05 +0800
Subject: [PATCH] 1

---
 .../mapper/DlDriveSchoolStudentMapper.java    |  2 +-
 .../base/DlDriveSchoolStudentMapper.xml       | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/mapper/DlDriveSchoolStudentMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/mapper/DlDriveSchoolStudentMapper.java
index 4899de1c..4482e78c 100644
--- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/mapper/DlDriveSchoolStudentMapper.java
+++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/mapper/DlDriveSchoolStudentMapper.java
@@ -97,5 +97,5 @@ public interface DlDriveSchoolStudentMapper extends BaseMapper<DlDriveSchoolStud
      * @author PQZ
      * @date 17:08 2025/2/19
      **/
-    List<StudentCountVO> indexGetTrainList(String type, Long coachId, String startTime, String endTime);
+    List<StudentCountVO> indexGetTrainList(@Param("type")String type, @Param("coachId")Long coachId, @Param("startTime")String startTime, @Param("endTime")String endTime);
 }
\ No newline at end of file
diff --git a/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolStudentMapper.xml b/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolStudentMapper.xml
index a38016bd..705b097c 100644
--- a/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolStudentMapper.xml
+++ b/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolStudentMapper.xml
@@ -155,20 +155,20 @@
         FROM
             drive_school_coach c
                 LEFT JOIN drive_school_student s ON c.id = s.source_user_id
+        <if test="type != null and type != ''">
+            AND s.source = #{type}
+        </if>
                 LEFT JOIN drive_school_course_order o ON s.user_id = o.user_id AND o.payment_status > 1
+        <if test="startTime != null and startTime != ''">
+            AND o.create_time &gt;= #{starTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND o.create_time &lt;= #{endTime}
+        </if>
         WHERE
             c.deleted = 0
-            <if test="type != null and type != ''">
-                AND s.source = #{type}
-            </if>
             <if test="coachId != null and coachId != ''">
-                AND c.id = #{coachId}
-            </if>
-            <if test="starTime != null and starTime != ''">
-                AND o.create_time &gt;= #{starTime}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND o.create_time &lt;= #{endTime}
+                AND c.user_id = #{coachId}
             </if>
         GROUP BY
             c.image, c.NAME, c.car_id