|
|
@@ -196,7 +196,7 @@
|
|
|
su.avatar_,
|
|
|
t.introduction_,
|
|
|
s.name_ subject_name_,
|
|
|
- COUNT(dgcgm.class_group_id_) number_of_classes_,
|
|
|
+ COUNT(cg.id_) number_of_classes_,
|
|
|
dgcp.id_,
|
|
|
dgcp.demo_group_id_,
|
|
|
dgcp.create_time_,
|
|
|
@@ -210,7 +210,7 @@
|
|
|
LEFT JOIN teacher t ON dg.user_id_=t.id_
|
|
|
LEFT JOIN sys_user su ON dg.user_id_=su.id_
|
|
|
LEFT JOIN `subject` s ON dg.subject_id_=s.id_
|
|
|
- LEFT JOIN demo_group_class_group_mapper dgcgm ON dg.id_=dgcgm.demo_group_id_
|
|
|
+ LEFT JOIN class_group cg ON dg.id_=cg.music_group_id_ AND cg.group_type_='DEMO'
|
|
|
<include refid="demoGroupQueryCondition"/>
|
|
|
GROUP BY dgcp.id_,dg.id_
|
|
|
ORDER BY dgcp.start_time_
|
|
|
@@ -243,8 +243,7 @@
|
|
|
GROUP_CONCAT(DISTINCT s.name_) subjectNames
|
|
|
FROM
|
|
|
demo_group dg
|
|
|
- LEFT JOIN demo_group_class_group_mapper dgcgm ON dg.id_=dgcgm.demo_group_id_
|
|
|
- LEFT JOIN class_group cg ON dgcgm.class_group_id_=cg.id_
|
|
|
+ LEFT JOIN class_group cg ON dg.id_=cg.music_group_id_ AND cg.group_type_='DEMO'
|
|
|
LEFT JOIN course_schedule cs ON cg.id_=cs.class_group_id_
|
|
|
LEFT JOIN `subject` s ON s.id_ = cg.subject_id_list_
|
|
|
WHERE cs.type_ = 'DEMO' AND dg.user_id_ = #{teacherId}
|
|
|
@@ -281,7 +280,7 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="queryCurrentMonthCoursesNum" resultType="int">
|
|
|
- select count(cs.id_) from course_schedule cs left join demo_group_class_group_mapper vgcgm on cs.class_group_id_ = vgcgm.class_group_id_ left join demo_group vg on vgcgm.demo_group_id_ = vg.id_ where cs.type_ in ('DEMO')
|
|
|
+ select count(cs.id_) from course_schedule cs left join demo_group vg on cs.music_group_id_ = vg.id_ AND cs.group_type_='DEMO' where cs.type_ in ('DEMO')
|
|
|
and DATE_FORMAT(cs.class_date_, '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m')
|
|
|
<if test="organId != null">
|
|
|
and find_in_set(#{organId},vg.organ_id_list_)
|
Joburgess