|
|
@@ -301,7 +301,7 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="queryTeacherAttendances" parameterType="map" resultMap="TeacherAttendancesDto">
|
|
|
- SELECT su.real_name_ teacher_name_,su.id_ teacher_id_,ta.course_schedule_id_,cs.name_ course_schedule_name_,
|
|
|
+ SELECT su.real_name_ teacher_name_,su.id_ teacher_id_,csts.course_schedule_id_,cs.name_ course_schedule_name_,
|
|
|
cs.status_ course_schedule_status_,
|
|
|
cs.class_date_,cs.start_class_time_,cs.end_class_time_,cs.type_ course_schedule_type_,
|
|
|
IF(ta.sign_in_status_ IS NULL,3,ta.sign_in_status_) sign_in_status_,
|
|
|
@@ -310,8 +310,7 @@
|
|
|
FROM course_schedule_teacher_salary csts
|
|
|
LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
|
|
|
LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = csts.course_schedule_id_ AND ta.teacher_id_ = csts.user_id_
|
|
|
- LEFT JOIN teacher t ON t.id_ = ta.teacher_id_
|
|
|
- LEFT JOIN sys_user su ON su.id_ = t.id_
|
|
|
+ LEFT JOIN sys_user su ON su.id_ = csts.user_id_
|
|
|
LEFT JOIN organization o ON o.id_ = cs.organ_id_
|
|
|
<include refid="queryTeacherAttendancesCondition"/>
|
|
|
ORDER BY cs.class_date_ ASC,cs.start_class_time_ ASC
|
|
|
@@ -328,9 +327,8 @@
|
|
|
SELECT COUNT(csts.id_)
|
|
|
FROM course_schedule_teacher_salary csts
|
|
|
LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
|
|
|
- LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = cs.id_
|
|
|
- LEFT JOIN teacher t ON t.id_ = ta.teacher_id_
|
|
|
- LEFT JOIN sys_user su ON su.id_ = t.id_
|
|
|
+ LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = csts.course_schedule_id_ AND ta.teacher_id_ = csts.user_id_
|
|
|
+ LEFT JOIN sys_user su ON su.id_ = csts.user_id_
|
|
|
<include refid="queryTeacherAttendancesCondition"/>
|
|
|
</select>
|
|
|
|
zouxuan