|
@@ -31,7 +31,6 @@
|
|
|
<result column="sign_in_status_" property="signInStatus"/>
|
|
|
<result column="sign_out_status_" property="signOutStatus"/>
|
|
|
<result column="seal_class_id_" property="sealClassId"/>
|
|
|
- <result column="teach_mode_" property="teachMode" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
|
|
|
</resultMap>
|
|
|
|
|
|
<resultMap type="com.ym.mec.biz.dal.entity.StudentCourseScheduleRecordDto" id="studentCourseScheduleRecord">
|
|
@@ -276,7 +275,8 @@
|
|
|
CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
|
|
|
cs.status_,
|
|
|
su.username_ teacher_name_,
|
|
|
- cgsm.status_ attendance_status_
|
|
|
+ cgsm.status_ attendance_status_,
|
|
|
+ cs.teach_mode_
|
|
|
FROM
|
|
|
course_schedule cs
|
|
|
LEFT JOIN sys_user su ON cs.teacher_id_=su.id_
|
|
@@ -298,16 +298,16 @@
|
|
|
CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
|
|
|
cs.status_,
|
|
|
s.name_ school_name_,
|
|
|
- cg.teach_mode_,
|
|
|
- ta.sign_in_status_ sign_in_status_,
|
|
|
- ta.sign_out_status_ sign_out_status_
|
|
|
+ ta.sign_in_status_,
|
|
|
+ ta.sign_out_status_,
|
|
|
+ cg.teach_mode_
|
|
|
FROM
|
|
|
course_schedule cs
|
|
|
LEFT JOIN sys_user su ON cs.teacher_id_=su.id_
|
|
|
LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
|
|
|
LEFT JOIN music_group mg ON cg.music_group_id_=mg.id_
|
|
|
LEFT JOIN school s ON mg.school_id_=s.id_
|
|
|
- LEFT JOIN teacher_attendance ta ON cs.id_=ta.class_group_id_ AND ta.teacher_id_=#{teacherId}
|
|
|
+ LEFT JOIN teacher_attendance ta ON cs.id_=ta.course_schedule_id_ AND ta.teacher_id_=#{teacherId}
|
|
|
WHERE
|
|
|
cs.class_date_ = DATE_FORMAT(#{classDate},'%Y%m%d')
|
|
|
AND cs.teacher_id_ = #{teacherId}
|