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/CancelledClassesMapper.xml | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/cloud-server-course/src/main/resources/mapper/CancelledClassesMapper.xml b/cloud-server-course/src/main/resources/mapper/CancelledClassesMapper.xml
index d3b7939..4126cec 100644
--- a/cloud-server-course/src/main/resources/mapper/CancelledClassesMapper.xml
+++ b/cloud-server-course/src/main/resources/mapper/CancelledClassesMapper.xml
@@ -7,23 +7,36 @@
t1.*,
t2.name,
CONCAT(t2.province, t2.city) AS provinceAndCity,
- t2.storeId,
- CONCAT(t3.classDate, t3.endDate) AS startAndEnd
+ t2.storeId,t2.coachId,
+ t2.name as courseName,t2.coachId
FROM
t_cancelled_classes t1
- LEFT JOIN
- t_course_package t2 ON t1.coursePackageId = t2.id
- LEFT JOIN (SELECT id,classDate,endDate FROM t_course_package_scheduling
- ) t3
- ON t1.coursePackageSchedulingId = t3.id
+ LEFT JOIN t_course_package t2 ON t1.coursePackageId = t2.id
+
<where>
<if test="query.courseName!=null and query.courseName!= ''">
- and t5.name = #{query.courseName}
+ and t2.name = #{query.courseName}
</if>
<if test="sTime !=null and sTime!= '' and eTime !=null and eTime!= ''">
and t1.insertTime between #{sTime} and #{eTime}
</if>
+
+ <if test="query.coachIds != null and query.coachIds.size()>0">
+ AND t2.coachId IN
+ <foreach collection="query.coachIds" separator="," item="id" open="(" close=")">
+ #{id}
+ </foreach>
+ </if>
+ <if test="collect != null and collect.size>0">
+ AND t2.id IN
+ <foreach collection="collect" separator="," item="id" open="(" close=")">
+ #{id}
+ </foreach>
+ </if>
</where>
</select>
+ <select id="getRefund" resultType="com.dsh.course.entity.MoneyBack">
+ select * from t_back_money where status = 1
+ </select>
</mapper>
--
Gitblit v1.7.1