|
@@ -279,7 +279,7 @@
|
|
|
SELECT COUNT(cs.id_)
|
|
|
FROM course_schedule cs
|
|
|
LEFT JOIN course_schedule_teacher_salary csts ON cs.id_ = csts.course_schedule_id_
|
|
|
- LEFT JOIN teacher_attendance ta ON cs.id_ = ta.course_schedule_id_
|
|
|
+ LEFT JOIN teacher_attendance ta ON cs.id_ = ta.course_schedule_id_ AND ta.teacher_id_ = csts.user_id_
|
|
|
LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
|
|
|
<include refid="queryCloses"/>
|
|
|
</select>
|
|
@@ -304,7 +304,7 @@
|
|
|
ta.sign_in_status_,ta.sign_out_status_,csts.actual_salary_,csts.settlement_time_,csts.subsidy_
|
|
|
FROM course_schedule cs
|
|
|
LEFT JOIN course_schedule_teacher_salary csts ON cs.id_ = csts.course_schedule_id_
|
|
|
- LEFT JOIN teacher_attendance ta ON cs.id_ = ta.course_schedule_id_
|
|
|
+ LEFT JOIN teacher_attendance ta ON cs.id_ = ta.course_schedule_id_ AND ta.teacher_id_ = csts.user_id_
|
|
|
LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
|
|
|
<include refid="queryCloses"/>
|
|
|
ORDER BY cs.class_date_,cs.start_class_time_ DESC
|
|
@@ -487,7 +487,7 @@
|
|
|
<where>
|
|
|
CONCAT(cs.class_date_,' ',cs.start_class_time_) < NOW()
|
|
|
<if test="teacherId != null">
|
|
|
- AND cs.actual_teacher_id_ = #{teacherId}
|
|
|
+ AND csts.user_id_ = #{teacherId}
|
|
|
</if>
|
|
|
<if test="courseStartDate != null and courseStartDate != ''">
|
|
|
AND cs.class_date_ >= #{courseStartDate}
|