|
|
@@ -174,7 +174,9 @@
|
|
|
|
|
|
<sql id="vipGroupSalaryQueryCondition">
|
|
|
<where>
|
|
|
- vg.id_=#{vipGroupId} AND FIND_IN_SET(#{organId},vg.organ_id_list_)
|
|
|
+ vg.id_=#{vipGroupId}
|
|
|
+ AND cs.group_type_='VIP'
|
|
|
+ AND FIND_IN_SET(#{organId},vg.organ_id_list_)
|
|
|
<if test="startTime!=null and endTime!=null">
|
|
|
AND (cs.class_date_ BETWEEN #{startTime} AND #{endTime})
|
|
|
</if>
|
|
|
@@ -190,7 +192,7 @@
|
|
|
csts.*
|
|
|
FROM
|
|
|
vip_group vg
|
|
|
- LEFT JOIN course_schedule cs ON vg.id_ = cs.music_group_id_ AND cs.group_type_='VIP'
|
|
|
+ LEFT JOIN course_schedule cs ON vg.id_ = cs.music_group_id_
|
|
|
LEFT JOIN course_schedule_teacher_salary csts ON cs.id_ = csts.course_schedule_id_
|
|
|
<include refid="vipGroupSalaryQueryCondition"/>
|
|
|
ORDER BY id_
|
Joburgess