|
|
@@ -490,7 +490,7 @@
|
|
|
cs.id_ course_schedule_id_,
|
|
|
cs.group_type_,
|
|
|
cs.music_group_id_,
|
|
|
- cs.type_,
|
|
|
+ CASE cs.type_ WHEN 'TRAINING_SINGLE' THEN 'SINGLE' WHEN 'TRAINING_MIX' THEN 'MIX' ELSE cs.type_ END type_,
|
|
|
cs.actual_teacher_id_,
|
|
|
CONCAT(cs.class_date_, ' ', cs.start_class_time_) course_start_time_,
|
|
|
cs.teach_mode_
|
|
|
@@ -502,7 +502,7 @@
|
|
|
AND (cs.del_flag_ IS NULL OR cs.del_flag_=0)
|
|
|
AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
|
|
|
AND cs.class_date_>=#{monday}
|
|
|
- AND cs.type_ IN ('SINGLE','VIP','MIX','PRACTICE')
|
|
|
+ AND cs.type_ IN ('SINGLE', 'TRAINING_SINGLE', 'VIP', 'MIX', 'TRAINING_MIX', 'PRACTICE')
|
|
|
AND cssp.create_time_<#{nextMonday}
|
|
|
<if test="studentIds!=null and studentIds.size()>0">
|
|
|
AND cssp.user_id_ IN
|
Joburgess