|
@@ -436,7 +436,7 @@
|
|
cs.actual_teacher_id_,
|
|
cs.actual_teacher_id_,
|
|
tea.real_name_ teacher_name_,
|
|
tea.real_name_ teacher_name_,
|
|
cs.music_group_id_ group_id_,
|
|
cs.music_group_id_ group_id_,
|
|
- cs.group_type_ group_type,
|
|
|
|
|
|
+ cs.group_type_,
|
|
cs.name_ group_name_,
|
|
cs.name_ group_name_,
|
|
CONCAT(cs.class_date_, ' ', cs.start_class_time_) course_start_time_,
|
|
CONCAT(cs.class_date_, ' ', cs.start_class_time_) course_start_time_,
|
|
CONCAT(cs.class_date_, ' ', cs.end_class_time_) course_end_time_,
|
|
CONCAT(cs.class_date_, ' ', cs.end_class_time_) course_end_time_,
|
|
@@ -453,7 +453,7 @@
|
|
LEFT JOIN course_schedule cs ON cs.id_=ch.course_schedule_id_
|
|
LEFT JOIN course_schedule cs ON cs.id_=ch.course_schedule_id_
|
|
LEFT JOIN sys_user tea ON cs.actual_teacher_id_=tea.id_
|
|
LEFT JOIN sys_user tea ON cs.actual_teacher_id_=tea.id_
|
|
WHERE
|
|
WHERE
|
|
- sch.user_id_=#{studentId} AND DATE_FORMAT( sch.create_time_, '%Y-%m-%d' ) BETWEEN #{monday} AND #{sunday})
|
|
|
|
|
|
+ sch.user_id_=#{studentId} AND cs.class_date_ BETWEEN #{monday} AND #{sunday})
|
|
ORDER BY homework_create_time_ DESC
|
|
ORDER BY homework_create_time_ DESC
|
|
<include refid="global.limit"/>
|
|
<include refid="global.limit"/>
|
|
</select>
|
|
</select>
|