From 852681bc9257e9eaae64d027a9bc6d88f93f35b4 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期六, 23 九月 2023 09:51:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/resources/mapper/CancelledClassesMapper.xml | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/cloud-server-course/src/main/resources/mapper/CancelledClassesMapper.xml b/cloud-server-course/src/main/resources/mapper/CancelledClassesMapper.xml
index 14a46b0..8b0ebe8 100644
--- a/cloud-server-course/src/main/resources/mapper/CancelledClassesMapper.xml
+++ b/cloud-server-course/src/main/resources/mapper/CancelledClassesMapper.xml
@@ -2,4 +2,22 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dsh.course.mapper.CancelledClassesMapper">
+ <select id="listAll" resultType="com.dsh.course.model.CancelClassesVO">
+ select t1.insertTime as insertTime,t2.coachId as coachId,CONCAT(t2.province,t2.city) as provinceAndCity,
+ t2.storeId as storeId,CONCAT(t3.classDate,t3.endDate) as startAndEnd,
+ t5.name as `courseName`,t4.appUserId as studentId from t_cancelled_classes t1
+ left join t_course_package t2 on t1.coursePackageId = t2.id
+ left join t_course_package_scheduling t3 on t3.coursePackageId = t2.id
+ left join t_course_package_student t4 on t4.coursePackageSchedulingId = t3.id
+ left join t_course t5 on t3.courseId = t5.id
+ <where>
+ <if test="query.courseName!=null and query.courseName!= ''">
+ and t5.name = #{query.courseName}
+ </if>
+ <if test="sTime !=null and sTime!= '' and eTime !=null and eTime!= ''">
+ and t1.insertTime between #{sTime} and #{eTime}
+ </if>
+ </where>
+ </select>
+
</mapper>
--
Gitblit v1.7.1