|
@@ -255,21 +255,21 @@
|
|
|
|
|
|
<select id="queryCourseSchedule" resultType="java.lang.String"
|
|
|
parameterType="com.yonge.cooleshow.biz.dal.dto.search.MyCourseSearch">
|
|
|
- SELECT s.class_date_
|
|
|
- FROM course_schedule_student_payment p
|
|
|
- LEFT JOIN course_schedule s ON p.course_id_ = s.id_
|
|
|
- WHERE s.teacher_id_=#{teacherId}
|
|
|
- AND s.lock_=0
|
|
|
- AND s.status_ IN ('ING','COMPLETE','NOT_START')
|
|
|
- AND p.course_type_ IN ('PIANO_ROOM_CLASS','PRACTICE')
|
|
|
- <![CDATA[ AND s.class_date_ >= #{startDate} ]]>
|
|
|
- <![CDATA[ AND s.class_date_ <= #{endDate} ]]>
|
|
|
- UNION
|
|
|
+-- SELECT s.class_date_
|
|
|
+-- FROM course_schedule_student_payment p
|
|
|
+-- LEFT JOIN course_schedule s ON p.course_id_ = s.id_
|
|
|
+-- WHERE s.teacher_id_=#{teacherId}
|
|
|
+-- AND s.lock_=0
|
|
|
+-- AND s.status_ IN ('ING','COMPLETE','NOT_START')
|
|
|
+-- AND p.course_type_ IN ('PIANO_ROOM_CLASS','PRACTICE')
|
|
|
+-- <![CDATA[ AND s.class_date_ >= #{startDate} ]]>
|
|
|
+-- <![CDATA[ AND s.class_date_ <= #{endDate} ]]>
|
|
|
+-- UNION
|
|
|
SELECT s.class_date_
|
|
|
FROM course_group g
|
|
|
LEFT JOIN course_schedule s ON g.id_=s.course_group_id_
|
|
|
WHERE g.teacher_id_=#{teacherId}
|
|
|
- AND g.type_='LIVE'
|
|
|
+-- AND g.type_='LIVE'
|
|
|
AND g.status_ IN ('COMPLETE','ING')
|
|
|
<![CDATA[ AND s.class_date_ >= #{startDate} ]]>
|
|
|
<![CDATA[ AND s.class_date_ <= #{endDate} ]]>
|