|
|
@@ -278,7 +278,8 @@
|
|
|
LEFT JOIN sys_user u ON s.teacher_id_ = u.id_
|
|
|
LEFT JOIN course_group g ON s.course_group_id_ = g.id_
|
|
|
LEFT JOIN `subject` b ON g.subject_id_ = b.id_
|
|
|
- WHERE s.id_ IN
|
|
|
+ WHERE s.status_='ING'
|
|
|
+ AND s.id_ IN
|
|
|
(SELECT course_id_ FROM course_schedule_student_payment WHERE user_id_ = #{param.studentId} AND course_type_ = 'PRACTICE')
|
|
|
<if test="param.status !=null and param.status !=''">
|
|
|
AND s.status_ = #{param.status}
|
|
|
@@ -359,7 +360,8 @@
|
|
|
<select id="queryCourseScheduleStudent" resultType="java.lang.String"
|
|
|
parameterType="com.yonge.cooleshow.biz.dal.dto.search.MyCourseSearch">
|
|
|
SELECT class_date_ FROM course_schedule
|
|
|
- WHERE id_ IN (SELECT course_id_ FROM course_schedule_student_payment WHERE user_id_ = #{studentId})
|
|
|
+ WHERE status_='ING'
|
|
|
+ AND id_ IN (SELECT course_id_ FROM course_schedule_student_payment WHERE user_id_ = #{studentId})
|
|
|
<![CDATA[ AND class_date_ >= #{startDate} ]]>
|
|
|
<![CDATA[ AND class_date_ <= #{endDate} ]]>
|
|
|
</select>
|
|
|
@@ -430,7 +432,8 @@
|
|
|
LEFT JOIN sys_user u ON s.teacher_id_ = u.id_
|
|
|
LEFT JOIN course_group g ON s.course_group_id_ = g.id_
|
|
|
LEFT JOIN `subject` b ON g.subject_id_ = b.id_
|
|
|
- WHERE s.id_ IN
|
|
|
+ WHERE s.status_ = 'ING'
|
|
|
+ AND s.id_ IN
|
|
|
(SELECT course_id_ FROM course_schedule_student_payment WHERE user_id_ = #{param.studentId} AND course_type_ = 'PRACTICE')
|
|
|
AND s.class_date_ = #{param.classDate}
|
|
|
UNION
|
|
|
@@ -451,7 +454,8 @@
|
|
|
FROM course_schedule s
|
|
|
LEFT JOIN course_group g ON s.course_group_id_ = g.id_
|
|
|
LEFT JOIN `subject` sb ON g.subject_id_=sb.id_
|
|
|
- WHERE s.id_ IN
|
|
|
+ WHERE s.status_ = 'ING'
|
|
|
+ AND s.id_ IN
|
|
|
(SELECT course_id_ FROM course_schedule_student_payment WHERE user_id_ = #{param.studentId} AND course_type_ = 'LIVE')
|
|
|
AND s.class_date_ = #{param.classDate}
|
|
|
ORDER BY startTime
|
cy