From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml b/cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml
index dd6e830..d8e0496 100644
--- a/cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml
+++ b/cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml
@@ -4,22 +4,21 @@
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.dsh.course.entity.CoursePackageScheduling">
- <id column="id" property="id" />
- <result column="coursePackageId" property="coursePackageId" />
- <result column="classDate" property="classDate" />
- <result column="courseId" property="courseId" />
- <result column="integral" property="integral" />
- <result column="cancelClasses" property="cancelClasses" />
- <result column="deductClassHour" property="deductClassHour" />
- <result column="status" property="status" />
+ <id column="id" property="id"/>
+ <result column="coursePackageId" property="coursePackageId"/>
+ <result column="classDate" property="classDate"/>
+ <result column="courseId" property="courseId"/>
+ <result column="integral" property="integral"/>
+ <result column="cancelClasses" property="cancelClasses"/>
+ <result column="deductClassHour" property="deductClassHour"/>
+ <result column="status" property="status"/>
</resultMap>
-
<select id="queryCoursePackageSchedulingList" resultType="map">
SELECT
CAST(id AS CHAR(20)) AS id,
- CONCAT(DATE_FORMAT(classDate, '%Y-%m-%d %H:%i'), '-20:00') AS classDate,
+ CONCAT(DATE_FORMAT(classDate, '%Y-%m-%d %H:%i'),'-',DATE_FORMAT(endDate, '%H:%i')) AS classDate,
courseId,
`status`,
cancelClasses,
@@ -31,10 +30,12 @@
</select>
<select id="queryAll" resultType="com.dsh.course.model.vo.response.AppUserVideoResponse">
- SELECT cs.courseId as videoId,cs.coursePackageId as coursePackageId,tc.coverDrawing as coverImage,tc.name as videoName,tc.introduce as synopsis,cs.integral,tc.courseVideo as courseVideo,cp.name as packageName
+ SELECT cs.courseId as videoId,cs.coursePackageId as coursePackageId,tc.coverDrawing as coverImage,tc.name as
+ videoName,tc.introduce as synopsis,cs.integral,tc.courseVideo as courseVideo,cp.name as packageName,cs.id as
+ scId
FROM t_course_package_scheduling cs
- LEFT JOIN t_course tc ON cs.courseId = tc.id
- left join t_course_package cp on cs.coursePackageId = cp.id
+ LEFT JOIN t_course tc ON cs.courseId = tc.id
+ left join t_course_package cp on cs.coursePackageId = cp.id
WHERE cs.courseId IS NOT NULL
<if test="longs != null">
AND cs.id IN
--
Gitblit v1.7.1