1、陪练课调整

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -2268,33 +2268,27 @@
     </select>
     <select id="findUserCourses" resultMap="CourseSchedule">
         SELECT
-            cs.id_,
-            cs.class_group_id_,
-            cs.group_type_,
-            cs.music_group_id_,
-            cs.status_,
-            CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
-            CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
-            cgtm.user_id_ teacher_id_,
-            cs.teach_mode_,
-            cs.type_
-        FROM
-          course_schedule_student_payment cssp
-          LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
-          LEFT JOIN class_group cg ON cg.id_ = cssp.class_group_id_
-          LEFT JOIN class_group_teacher_mapper cgtm ON cgtm.class_group_id_ = cssp.class_group_id_
-          LEFT JOIN class_group_student_mapper cgsm ON cgsm.user_id_ = cssp.user_id_
-          AND cssp.class_group_id_ = cgsm.class_group_id_
+        cs.id_,
+        cs.`type_`,
+        cgtm.`user_id_` teacher_id_
+        FROM
+        `class_group_student_mapper` cgsm
+        LEFT JOIN `class_group` cg ON cgsm.`class_group_id_` = cg.`id_`
+        LEFT JOIN `class_group_teacher_mapper` cgtm ON cgtm.`class_group_id_` = cg.`id_`
+        AND cgtm.`teacher_role_` = 'BISHOP'
+        LEFT JOIN `course_schedule` cs ON cs.`class_group_id_` = cg.`id_`
         WHERE
-          ( cs.del_flag_ != 1 OR cs.del_flag_ IS NULL )
-          AND cssp.user_id_ = #{userId}
-          AND cgtm.teacher_role_='BISHOP'
-          AND cgsm.status_ = 'NORMAL'
-          AND cg.type_ IN ('NORMAL','HIGH','VIP')
-          AND cgtm.user_id_ IN
-          <foreach collection="teacherIds" item="teacherId" open="(" close=")" separator=",">
-              #{teacherId}
-          </foreach>
+            cgtm.user_id_=#{userId}
+            AND cgtm.teacher_role_='BISHOP'
+            AND cgsm.status_ = 'NORMAL'
+            AND cg.`type_` IN ( 'NORMAL', 'HIGH', 'VIP' )
+            AND cs.`id_` IS NOT NULL
+            AND cgtm.user_id_ IN
+            <foreach collection="teacherIds" item="teacherId" open="(" close=")" separator=",">
+                #{teacherId}
+            </foreach>
+            AND ( cs.del_flag_ != 1 OR cs.del_flag_ IS NULL )
+        GROUP BY cg.`id_`
     </select>
 
     <select id="queryTeacherName" resultType="java.util.Map">