From f7e51fc7c91e474e5c0bcc79c47f074c0a59b5c3 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 11 十月 2023 20:03:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml b/cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml
index fdf9e32..5ea7737 100644
--- a/cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml
+++ b/cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml
@@ -17,14 +17,16 @@
<select id="queryCoursePackageSchedulingList" resultType="map">
- select
- CAST(id AS CHAR(20)) as id,
- DATE_FORMAT(classDate, '%Y-%m-%d') as classDate,
- courseId,
- `status`,
- cancelClasses,
- deductClassHour,
- integral
- from t_course_package_scheduling where coursePackageId = #{item.coursePackageId} order by classDate desc
+ SELECT
+ CAST(id AS CHAR(20)) AS id,
+ CONCAT(DATE_FORMAT(classDate, '%Y-%m-%d %H:%i'), '-20:00') AS classDate,
+ courseId,
+ `status`,
+ cancelClasses,
+ deductClassHour,
+ integral
+ FROM t_course_package_scheduling where coursePackageId = #{item.coursePackageId} GROUP BY classDate
+ order by classDate desc
+
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.7.1