From 621a6b8de5013700a9009e15e4a7e3400c6625d1 Mon Sep 17 00:00:00 2001
From: xuyuncong <3422692813@qq.com>
Date: Mon, 13 Oct 2025 16:01:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/DlDriveSchoolStudentController.java | 33 +++++++++++--------
 .../base/DlDriveSchoolStudentMapper.xml       |  2 +-
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolStudentController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolStudentController.java
index 42aa8d49..4254c897 100644
--- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolStudentController.java
+++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolStudentController.java
@@ -164,21 +164,26 @@ public class DlDriveSchoolStudentController {
         //默认查全部数据
         String startTimeStr = "";
         String endTimeStr = "";
-        if("more".equals(timeType)){
-            if(StringUtils.isNotEmpty(startTime)){
-                startTimeStr = startTime+" 00:00:01";
+        if (startTime != null && endTime != null) {
+            startTimeStr = startTime+" 00:00:00";
+            endTimeStr = endTime+" 23:59:59";
+        }else {
+            if ("more".equals(timeType)) {
+                if (StringUtils.isNotEmpty(startTime)) {
+                    startTimeStr = startTime + " 00:00:01";
+                }
+                if (StringUtils.isNotEmpty(endTime)) {
+                    endTimeStr = endTime + " 23:59:59";
+                }
+            } else if ("month".equals(timeType)) {
+                //当月
+                startTimeStr = DateUtil.format(DateUtil.beginOfMonth(DateUtil.date()), "yyyy-MM-dd") + " 00:00:01";
+                endTimeStr = DateUtil.format(DateUtil.endOfMonth(DateUtil.date()), "yyyy-MM-dd") + " 23:59:59";
+            } else if ("day".equals(timeType)) {
+                //当天
+                startTimeStr = DateUtil.formatDate(DateUtil.date()) + " 00:00:01";
+                endTimeStr = DateUtil.formatDate(DateUtil.date()) + " 23:59:59";
             }
-            if(StringUtils.isNotEmpty(endTime)) {
-                endTimeStr = endTime + " 23:59:59";
-            }
-        }else if("month".equals(timeType)){
-            //当月
-            startTimeStr = DateUtil.format(DateUtil.beginOfMonth(DateUtil.date()),"yyyy-MM-dd")+" 00:00:01";
-            endTimeStr = DateUtil.format(DateUtil.endOfMonth(DateUtil.date()),"yyyy-MM-dd")+" 23:59:59";
-        }else if("day".equals(timeType)){
-            //当天
-            startTimeStr = DateUtil.formatDate(DateUtil.date())+" 00:00:01";
-            endTimeStr = DateUtil.formatDate(DateUtil.date())+" 23:59:59";
         }
         return success(schoolStudentService.indexGetTrainList(type,coachId,startTimeStr,endTimeStr));
     }
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 acc3ff18..ffc53ad2 100644
--- a/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolStudentMapper.xml
+++ b/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolStudentMapper.xml
@@ -583,7 +583,7 @@
         <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 AND o.deleted=0 AND o.is_sign = 1 AND o.if_end = 0
+        Inner JOIN drive_school_course_order o ON s.user_id = o.user_id AND o.payment_status > 1 AND o.deleted=0 AND o.is_sign = 1 AND o.if_end = 0
         <if test="startTime != null and startTime != ''">
             AND o.create_time &gt;= #{startTime}
         </if>