|
|
@@ -1149,12 +1149,11 @@
|
|
|
LEFT JOIN course_schedule cs ON cs.class_group_id_ = cgsm.class_group_id_
|
|
|
left join school s on s.id_ = cs.schoole_id_
|
|
|
LEFT JOIN sys_user su ON cs.actual_teacher_id_ = su.id_
|
|
|
- WHERE (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
|
|
|
- AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL)
|
|
|
+ WHERE (cs.is_lock_ = 0 OR cs.is_lock_ IS NULL)
|
|
|
AND cs.status_ = 'NOT_START'
|
|
|
AND cgsm.user_id_ = #{userId}
|
|
|
AND cs.class_date_ = DATE_FORMAT(#{date}, '%Y%m%d')
|
|
|
- AND cgsm.status_ != 'QUIT' AND cs.pre_course_flag_ = 0
|
|
|
+ AND cgsm.status_ != 'QUIT' AND cs.pre_course_flag_ = 0 AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_)
|
|
|
ORDER BY cs.class_date_, cs.start_class_time_
|
|
|
</select>
|
|
|
<select id="findCourseScheduleByMusicGroup" resultMap="CourseSchedule">
|
zouxuan