Merge remote-tracking branch 'origin/master'

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

@@ -2911,11 +2911,11 @@
 
     <select id="getStudentCourseSchedules" resultMap="courseScheduleDto">
         SELECT cs.id_,concat(cs.`class_date_`,' ',cs.`start_class_time_` ) start_class_time_,cs.actual_teacher_id_, su.real_name_
-        teacher_name_,cgsm.user_id_ student_id_
+        teacher_name_,cssp.user_id_ student_id_
         FROM course_schedule cs
         LEFT JOIN sys_user su on cs.actual_teacher_id_ = su.id_
-        LEFT JOIN class_group_student_mapper cgsm on cs.class_group_id_ = cgsm.class_group_id_
-        WHERE cgsm.user_id_ IN
+        LEFT JOIN course_schedule_student_payment cssp on cs.id_ = cssp.course_schedule_id_
+        WHERE cssp.user_id_ IN
         <foreach collection="studentIds" separator="," open="(" close=")" item="studentId">
             #{studentId}
         </foreach>
@@ -2925,10 +2925,10 @@
     </select>
 
     <select id="getStudentCourseScheduleNum" resultMap="com.ym.mec.biz.dal.dao.PracticeGroupDao.courseGroupExport">
-        SELECT COUNT(*) total_class_times_,cgsm.user_id_ student_id_
+        SELECT COUNT(*) total_class_times_,cssp.user_id_ student_id_
         FROM course_schedule cs
-        LEFT JOIN class_group_student_mapper cgsm on cs.class_group_id_ = cgsm.class_group_id_
-        WHERE cgsm.user_id_ IN
+        LEFT JOIN course_schedule_student_payment cssp on cs.id_ = cssp.course_schedule_id_
+        WHERE cssp.user_id_ IN
         <foreach collection="studentIds" separator="," open="(" close=")" item="studentId">
             #{studentId}
         </foreach>
@@ -2937,7 +2937,7 @@
             AND cs.status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
         </if>
         AND (cs.del_flag_ IS NULL OR cs.del_flag_ =0)
-        GROUP BY cgsm.user_id_
+        GROUP BY cssp.user_id_
     </select>
 
     <select id="getVipGroupExport" resultMap="com.ym.mec.biz.dal.dao.PracticeGroupDao.courseGroupExport">