|
@@ -66,11 +66,10 @@
|
|
|
ROUND(AVG(TIMESTAMPDIFF(MINUTE,start_class_time_,end_class_time_)),0) average_class_minutes_
|
|
|
FROM teacher t
|
|
|
LEFT JOIN sys_user su ON t.id_=su.id_
|
|
|
- LEFT JOIN course_schedule_teacher_salary csts ON csts.user_id_=t.id_
|
|
|
- LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
|
|
|
- WHERE cs.class_date_ >= #{startDate} AND cs.class_date_ <= #{endDate} AND csts.group_type_ IN ('VIP','MUSIC', 'PRACTICE')
|
|
|
- AND cs.del_flag_ != 1
|
|
|
- AND su.del_flag_ != 1
|
|
|
+ LEFT JOIN course_schedule_teacher_salary csts ON csts.user_id_=t.id_ AND csts.group_type_ IN ( 'VIP', 'MUSIC', 'PRACTICE' )
|
|
|
+ LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_ AND cs.del_flag_ != 1
|
|
|
+ AND cs.class_date_ >= #{startDate} AND cs.class_date_ <= #{endDate}
|
|
|
+ WHERE su.del_flag_ != 1 AND su.lock_flag_!=1
|
|
|
AND t.demission_date_ IS NULL
|
|
|
AND t.organ_id_ IS NOT NULL
|
|
|
GROUP BY csts.user_id_
|