From aa925d851857f50eff0556411366690d9a78a0e5 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 27 十一月 2023 17:30:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-course/src/main/resources/mapper/CoursePackageStudentMapper.xml | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/cloud-server-course/src/main/resources/mapper/CoursePackageStudentMapper.xml b/cloud-server-course/src/main/resources/mapper/CoursePackageStudentMapper.xml
index be9a00a..b18cee6 100644
--- a/cloud-server-course/src/main/resources/mapper/CoursePackageStudentMapper.xml
+++ b/cloud-server-course/src/main/resources/mapper/CoursePackageStudentMapper.xml
@@ -14,12 +14,12 @@
signInOrNot,
reservationStatus
from t_course_package_student where 1=1
- <if test="ids != null and ids.size() > 0">
- and coursePackageSchedulingId in
- <foreach collection="ids" close=")" item="id" open="(" separator=",">
- #{id}
- </foreach>
- </if>
+ <if test="ids != null and ids.size() > 0">
+ and coursePackageSchedulingId in
+ <foreach collection="ids" close=")" item="id" open="(" separator=",">
+ #{id}
+ </foreach>
+ </if>
and reservationStatus != 3
<if test="null != userId">
@@ -52,14 +52,15 @@
<select id="getClassList" resultType="com.dsh.course.entity.dto.ClassListDto">
SELECT
- *,
- pg.NAME AS className,
- pg.`type` AS classType
+ *,
+ pg.NAME AS className,
+ pg.`type` AS classType
FROM
- t_course_package_payment py
- LEFT JOIN t_course_package pg ON py.coursePackageId = pg.id
+ t_course_package_order_student py
+ LEFT JOIN t_course_package pg ON py.coursePackageId = pg.id
<where>
+ py.status = 1
<if test="null != tStudentId">
and py.studentId = #{tStudentId}
</if>
--
Gitblit v1.7.1