|
@@ -1024,7 +1024,8 @@
|
|
|
LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = cs.id_
|
|
|
LEFT JOIN course_schedule_student_payment cssp ON cssp.course_schedule_id_ = cs.id_
|
|
|
LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cssp.course_schedule_id_ AND cssp.user_id_ = sa.user_id_
|
|
|
- WHERE cs.pre_course_flag_ != 1 AND cs.status_ = 'OVER' AND cs.del_flag_ = '0' AND cs.class_date_ >= #{startTime}
|
|
|
+ WHERE cs.pre_course_flag_ = 0 AND cs.del_flag_ = '0'
|
|
|
+ AND cs.class_date_ BETWEEN #{startTime} AND CURDATE()
|
|
|
AND (sa.id_ IS NULL OR (sa.status_ = 'TRUANT' AND sa.visit_flag_ = 0)) AND cssp.id_ IS NOT NULL
|
|
|
AND EXISTS (SELECT id_ FROM course_schedule_teacher_salary WHERE cs.id_=course_schedule_id_ AND settlement_time_ IS NULL)
|
|
|
AND cs.merge_flag_ IN (0,1)
|
|
@@ -1053,7 +1054,7 @@
|
|
|
LEFT JOIN course_schedule_student_payment cssp ON cssp.course_schedule_id_ = cs.id_
|
|
|
LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cssp.course_schedule_id_ AND cssp.user_id_ = sa.user_id_
|
|
|
WHERE ta.teacher_id_ = cs.actual_teacher_id_ and cs.tenant_id_ = #{tenantId}
|
|
|
- AND cs.status_ = 'OVER' AND cs.del_flag_ = '0' AND cs.class_date_ >= #{startTime} AND cs.pre_course_flag_ != 1
|
|
|
+ AND cs.del_flag_ = '0' AND cs.class_date_ BETWEEN #{startTime} AND CURDATE() AND cs.pre_course_flag_ = 0
|
|
|
AND (((ta.sign_in_status_ = 0 OR ta.sign_in_status_ IS NULL OR ta.sign_out_status_ = 0 OR ta.sign_out_status_ IS NULL) AND ta.dispose_content_ IS NULL) OR (sa.id_ IS NULL OR (sa.status_ = 'TRUANT' AND sa.visit_flag_ = 0)))
|
|
|
AND (ta.sign_out_status_ IS NOT NULL OR ta.sign_in_status_ IS NOT NULL)
|
|
|
AND cs.merge_flag_ IN (0,1) AND cssp.id_ IS NOT NULL
|
|
@@ -1077,7 +1078,7 @@
|
|
|
SELECT COUNT(DISTINCT cs.id_) FROM course_schedule cs
|
|
|
LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = cs.id_
|
|
|
WHERE ta.teacher_id_ = cs.actual_teacher_id_ and cs.tenant_id_ = #{tenantId}
|
|
|
- AND cs.status_ = 'OVER' AND cs.del_flag_ = '0' AND cs.class_date_>=#{startTime} AND cs.pre_course_flag_ != 1
|
|
|
+ AND cs.del_flag_ = '0' AND cs.class_date_ BETWEEN #{startTime} AND CURDATE() AND cs.pre_course_flag_ = 0
|
|
|
AND ta.sign_in_time_ IS NULL AND ta.sign_out_time_ IS NULL AND ta.complaints_content_ IS NULL AND ta.dispose_content_ IS NULL
|
|
|
AND cs.merge_flag_ IN (0,1)
|
|
|
AND EXISTS (SELECT id_ FROM course_schedule_teacher_salary WHERE cs.id_=course_schedule_id_ AND settlement_time_ IS NULL)
|
|
@@ -1102,7 +1103,7 @@
|
|
|
FROM course_schedule cs
|
|
|
LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = cs.id_
|
|
|
WHERE ta.teacher_id_ = cs.actual_teacher_id_ and cs.tenant_id_ = #{tenantId}
|
|
|
- AND cs.status_ = 'OVER' AND cs.del_flag_ = '0' AND cs.class_date_>=#{startTime} AND cs.pre_course_flag_ != 1
|
|
|
+ AND cs.del_flag_ = '0' AND cs.class_date_ BETWEEN #{startTime} AND CURDATE() AND cs.pre_course_flag_ = 0
|
|
|
AND ta.sign_in_time_ IS NULL AND ta.sign_out_time_ IS NULL AND ta.dispose_content_ IS NULL
|
|
|
AND cs.merge_flag_ IN (0,1)
|
|
|
AND EXISTS (SELECT id_ FROM course_schedule_teacher_salary WHERE cs.id_=course_schedule_id_ AND settlement_time_ IS NULL)
|