|
@@ -57,9 +57,10 @@
|
|
INNER JOIN xjr_workflow_form_relation t2 ON t1.id = t2.form_key_value
|
|
INNER JOIN xjr_workflow_form_relation t2 ON t1.id = t2.form_key_value
|
|
INNER JOIN course_table_bak t3 ON t1.id = t3.wf_course_adjust_id
|
|
INNER JOIN course_table_bak t3 ON t1.id = t3.wf_course_adjust_id
|
|
LEFT JOIN class_time t4 ON t3.time_period = t4.time_period AND t3.time_number = t4.number
|
|
LEFT JOIN class_time t4 ON t3.time_period = t4.time_period AND t3.time_number = t4.number
|
|
|
|
+ <!-- INNER JOIN course_table t5 ON t5.id = t3.id-->
|
|
WHERE t1.delete_mark = 0 AND t2.current_state = 'COMPLETED'
|
|
WHERE t1.delete_mark = 0 AND t2.current_state = 'COMPLETED'
|
|
<!-- AND t1.reason IN ('sick_leave','leave_absence') -->
|
|
<!-- AND t1.reason IN ('sick_leave','leave_absence') -->
|
|
- and t1.adjust_type = 'course_substitute'
|
|
|
|
|
|
+ and t1.adjust_type = 'course_substitute' and t1.enabled_mark = 1
|
|
AND t3.schedule_date BETWEEN #{dto.startDate} and #{dto.endDate}
|
|
AND t3.schedule_date BETWEEN #{dto.startDate} and #{dto.endDate}
|
|
AND t3.schedule_date NOT IN (
|
|
AND t3.schedule_date NOT IN (
|
|
SELECT DATE FROM holiday_date WHERE STATUS = 3
|
|
SELECT DATE FROM holiday_date WHERE STATUS = 3
|