|
@@ -948,7 +948,7 @@
|
|
|
WHERE ta.teacher_id_ = cs.actual_teacher_id_
|
|
|
AND cs.status_ = 'OVER' AND cs.del_flag_ = 0 AND cs.class_date_ >= '2021-02-01'
|
|
|
AND (((ta.sign_in_status_ = 0 OR ta.sign_out_status_ = 0) AND ta.dispose_content_ IS NULL) OR (sa.id_ IS NULL OR (sa.status_ = 'TRUANT' AND sa.visit_flag_ = 0)))
|
|
|
- AND ta.sign_in_status_ IS NOT NULL AND ta.sign_out_status_ IS NOT NULL
|
|
|
+ AND (ta.sign_in_status_ IS NOT NULL OR ta.sign_out_status_ IS NOT NULL)
|
|
|
AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_) 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)
|
|
|
<if test="classGroupIds != null and classGroupIds.size() > 0">
|
|
@@ -977,7 +977,7 @@
|
|
|
WHERE ta.teacher_id_ = cs.actual_teacher_id_
|
|
|
AND cs.status_ = 'OVER' AND cs.del_flag_ = 0 AND cs.class_date_ >= '2021-02-01'
|
|
|
AND (((ta.sign_in_status_ = 0 OR ta.sign_out_status_ = 0) AND ta.dispose_content_ IS NULL) OR (sa.id_ IS NULL OR (sa.status_ = 'TRUANT' AND sa.visit_flag_ = 0)))
|
|
|
- AND ta.sign_in_status_ IS NOT NULL AND ta.sign_out_status_ IS NOT NULL
|
|
|
+ AND (ta.sign_in_status_ IS NOT NULL OR ta.sign_out_status_ IS NOT NULL)
|
|
|
AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_) 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)
|
|
|
<if test="classGroupIds != null and classGroupIds.size() > 0">
|