|
@@ -664,11 +664,10 @@
|
|
CASE WHEN ta.complaints_status_=0 THEN '拒绝' WHEN ta.complaints_status_ = 1 THEN '通过'
|
|
CASE WHEN ta.complaints_status_=0 THEN '拒绝' WHEN ta.complaints_status_ = 1 THEN '通过'
|
|
WHEN ta.complaints_status_=2 THEN '待处理' WHEN ta.complaints_status_ = 3 THEN '已撤销' END complaints_status_,ta.dispose_content_,
|
|
WHEN ta.complaints_status_=2 THEN '待处理' WHEN ta.complaints_status_ = 3 THEN '已撤销' END complaints_status_,ta.dispose_content_,
|
|
ROUND((UNIX_TIMESTAMP(ta.sign_out_time_)-UNIX_TIMESTAMP(ta.sign_in_time_))/60) currentTime,
|
|
ROUND((UNIX_TIMESTAMP(ta.sign_out_time_)-UNIX_TIMESTAMP(ta.sign_in_time_))/60) currentTime,
|
|
- ta.sign_in_time_ signInTime,ta.sign_out_time_ signOutTime,COUNT(DISTINCT sp.id_) studentNum,COUNT(DISTINCT sa.id_) realStudentNum,ts.deduction_reason_
|
|
|
|
|
|
+ ta.sign_in_time_ signInTime,ta.sign_out_time_ signOutTime,COUNT(DISTINCT sp.id_) studentNum,ts.deduction_reason_
|
|
FROM course_schedule_teacher_salary ts
|
|
FROM course_schedule_teacher_salary ts
|
|
LEFT JOIN course_schedule cs ON ts.course_schedule_id_ = cs.id_
|
|
LEFT JOIN course_schedule cs ON ts.course_schedule_id_ = cs.id_
|
|
LEFT JOIN `teacher_attendance` ta ON ta.`teacher_id_` = ts.`user_id_` AND ta.`course_schedule_id_` = ts.`course_schedule_id_`
|
|
LEFT JOIN `teacher_attendance` ta ON ta.`teacher_id_` = ts.`user_id_` AND ta.`course_schedule_id_` = ts.`course_schedule_id_`
|
|
- LEFT JOIN `student_attendance` sa ON sa.`course_schedule_id_` = ts.`course_schedule_id_` AND sa.status_ = 'NORMAL'
|
|
|
|
LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
|
|
LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
|
|
LEFT JOIN sys_user u ON ts.user_id_= u.id_
|
|
LEFT JOIN sys_user u ON ts.user_id_= u.id_
|
|
LEFT JOIN teacher t ON t.id_ = ts.user_id_
|
|
LEFT JOIN teacher t ON t.id_ = ts.user_id_
|
|
@@ -700,7 +699,7 @@
|
|
CASE WHEN ta.complaints_status_=0 THEN '拒绝' WHEN ta.complaints_status_ = 1 THEN '通过'
|
|
CASE WHEN ta.complaints_status_=0 THEN '拒绝' WHEN ta.complaints_status_ = 1 THEN '通过'
|
|
WHEN ta.complaints_status_=2 THEN '待处理' WHEN ta.complaints_status_ = 3 THEN '已撤销' END complaints_status_,ta.dispose_content_,
|
|
WHEN ta.complaints_status_=2 THEN '待处理' WHEN ta.complaints_status_ = 3 THEN '已撤销' END complaints_status_,ta.dispose_content_,
|
|
ROUND((UNIX_TIMESTAMP(ta.sign_out_time_)-UNIX_TIMESTAMP(ta.sign_in_time_))/60) currentTime,
|
|
ROUND((UNIX_TIMESTAMP(ta.sign_out_time_)-UNIX_TIMESTAMP(ta.sign_in_time_))/60) currentTime,
|
|
- ta.sign_in_time_ signInTime,ta.sign_out_time_ signOutTime,COUNT(DISTINCT sp.id_) studentNum,COUNT(DISTINCT sa.id_) realStudentNum,
|
|
|
|
|
|
+ ta.sign_in_time_ signInTime,ta.sign_out_time_ signOutTime,COUNT(DISTINCT sp.id_) studentNum,
|
|
vg.online_classes_unit_price_,vg.offline_classes_unit_price_,
|
|
vg.online_classes_unit_price_,vg.offline_classes_unit_price_,
|
|
GROUP_CONCAT(sa.sign_in_time_) studentSignInTime,GROUP_CONCAT(sa.sign_out_time_) studentSignOutTime,ts.deduction_reason_
|
|
GROUP_CONCAT(sa.sign_in_time_) studentSignInTime,GROUP_CONCAT(sa.sign_out_time_) studentSignOutTime,ts.deduction_reason_
|
|
FROM course_schedule_teacher_salary ts
|
|
FROM course_schedule_teacher_salary ts
|
|
@@ -712,7 +711,7 @@
|
|
LEFT JOIN organization o ON o.id_ = t.organ_id_
|
|
LEFT JOIN organization o ON o.id_ = t.organ_id_
|
|
LEFT JOIN school s ON s.id_ = cs.schoole_id_
|
|
LEFT JOIN school s ON s.id_ = cs.schoole_id_
|
|
LEFT JOIN course_schedule_student_payment sp ON sp.course_schedule_id_ = ts.course_schedule_id_
|
|
LEFT JOIN course_schedule_student_payment sp ON sp.course_schedule_id_ = ts.course_schedule_id_
|
|
- LEFT JOIN `student_attendance` sa ON sa.`course_schedule_id_` = ts.`course_schedule_id_` AND sa.status_ = 'NORMAL'
|
|
|
|
|
|
+ LEFT JOIN `student_attendance` sa ON sa.`course_schedule_id_` = ts.`course_schedule_id_`
|
|
LEFT JOIN vip_group vg ON (vg.id_ = ts.music_group_id_ AND ts.group_type_ = 'VIP')
|
|
LEFT JOIN vip_group vg ON (vg.id_ = ts.music_group_id_ AND ts.group_type_ = 'VIP')
|
|
LEFT JOIN vip_group_activity vga ON vg.vip_group_activity_id_ = vga.id_
|
|
LEFT JOIN vip_group_activity vga ON vg.vip_group_activity_id_ = vga.id_
|
|
LEFT JOIN organization vgo ON vgo.id_ = vg.organ_id_
|
|
LEFT JOIN organization vgo ON vgo.id_ = vg.organ_id_
|
|
@@ -743,7 +742,7 @@
|
|
CASE WHEN ta.complaints_status_=0 THEN '拒绝' WHEN ta.complaints_status_ = 1 THEN '通过'
|
|
CASE WHEN ta.complaints_status_=0 THEN '拒绝' WHEN ta.complaints_status_ = 1 THEN '通过'
|
|
WHEN ta.complaints_status_=2 THEN '待处理' WHEN ta.complaints_status_ = 3 THEN '已撤销' END complaints_status_,ta.dispose_content_,
|
|
WHEN ta.complaints_status_=2 THEN '待处理' WHEN ta.complaints_status_ = 3 THEN '已撤销' END complaints_status_,ta.dispose_content_,
|
|
ROUND((UNIX_TIMESTAMP(ta.sign_out_time_)-UNIX_TIMESTAMP(ta.sign_in_time_))/60) currentTime,
|
|
ROUND((UNIX_TIMESTAMP(ta.sign_out_time_)-UNIX_TIMESTAMP(ta.sign_in_time_))/60) currentTime,
|
|
- ta.sign_in_time_ signInTime,ta.sign_out_time_ signOutTime,COUNT(DISTINCT sp.id_) studentNum,COUNT(DISTINCT sa.id_) realStudentNum,
|
|
|
|
|
|
+ ta.sign_in_time_ signInTime,ta.sign_out_time_ signOutTime,COUNT(DISTINCT sp.id_) studentNum,
|
|
GROUP_CONCAT(sa.sign_in_time_) studentSignInTime,GROUP_CONCAT(sa.sign_out_time_) studentSignOutTime,ts.deduction_reason_
|
|
GROUP_CONCAT(sa.sign_in_time_) studentSignInTime,GROUP_CONCAT(sa.sign_out_time_) studentSignOutTime,ts.deduction_reason_
|
|
FROM course_schedule_teacher_salary ts
|
|
FROM course_schedule_teacher_salary ts
|
|
LEFT JOIN course_schedule cs ON ts.course_schedule_id_ = cs.id_
|
|
LEFT JOIN course_schedule cs ON ts.course_schedule_id_ = cs.id_
|
|
@@ -754,7 +753,7 @@
|
|
LEFT JOIN organization o ON o.id_ = t.organ_id_
|
|
LEFT JOIN organization o ON o.id_ = t.organ_id_
|
|
LEFT JOIN school s ON s.id_ = cs.schoole_id_
|
|
LEFT JOIN school s ON s.id_ = cs.schoole_id_
|
|
LEFT JOIN course_schedule_student_payment sp ON sp.course_schedule_id_ = ts.course_schedule_id_
|
|
LEFT JOIN course_schedule_student_payment sp ON sp.course_schedule_id_ = ts.course_schedule_id_
|
|
- LEFT JOIN `student_attendance` sa ON sa.`course_schedule_id_` = ts.`course_schedule_id_` AND sa.status_ = 'NORMAL'
|
|
|
|
|
|
+ LEFT JOIN `student_attendance` sa ON sa.`course_schedule_id_` = ts.`course_schedule_id_`
|
|
LEFT JOIN practice_group pg ON (pg.id_ = ts.music_group_id_ AND ts.group_type_ = 'PRACTICE')
|
|
LEFT JOIN practice_group pg ON (pg.id_ = ts.music_group_id_ AND ts.group_type_ = 'PRACTICE')
|
|
LEFT JOIN organization pgo ON pgo.id_ = pg.organ_id_
|
|
LEFT JOIN organization pgo ON pgo.id_ = pg.organ_id_
|
|
WHERE cs.class_date_ BETWEEN #{firstDayOfMonth} AND #{lastDayOfMonth} AND cs.`del_flag_` != 1 AND cs.group_type_ = 'PRACTICE' AND ts.settlement_time_ IS NOT NULL
|
|
WHERE cs.class_date_ BETWEEN #{firstDayOfMonth} AND #{lastDayOfMonth} AND cs.`del_flag_` != 1 AND cs.group_type_ = 'PRACTICE' AND ts.settlement_time_ IS NOT NULL
|