Merge remote-tracking branch 'origin/master'

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

@@ -1498,15 +1498,12 @@
     </delete>
     
     <select id="queryUnsignedStudentList" resultMap="StudentAttendance">
-        SELECT a.*,cg.current_class_times_,sa.id_ FROM (SELECT cssp.user_id_,cs.actual_teacher_id_ teacher_id_,
-        cs.id_ course_schedule_id_,cs.class_group_id_,cs.music_group_id_,cs.group_type_
+        SELECT cssp.user_id_,cs.actual_teacher_id_ teacher_id_,
+        cs.id_ course_schedule_id_,cs.class_group_id_,cs.music_group_id_,cs.group_type_,cg.current_class_times_
         FROM course_schedule_student_payment cssp
-        LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_
-        WHERE CONCAT(cs.class_date_,' ',cs.end_class_time_) &lt;= now() AND cssp.actual_price_ IS NOT NULL) a
-        LEFT JOIN class_group cg ON a.class_group_id_ = cg.id_
-        LEFT JOIN student_attendance sa ON sa.user_id_ = a.user_id_ AND a.teacher_id_ = sa.teacher_id_
-        AND sa.class_group_id_ = a.class_group_id_ AND sa.course_schedule_id_ = a.course_schedule_id_
-        WHERE sa.id_ IS NULL
+        LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_ LEFT JOIN class_group cg ON cg.id_=cs.class_group_id_
+        LEFT JOIN student_attendance sa ON sa.course_schedule_id_= cssp.course_schedule_id_
+        WHERE CONCAT(cs.class_date_,' ',cs.end_class_time_) <= now() AND sa.id_ IS NULL
     </select>
     <select id="getNextCourseSchedule" resultMap="CourseSchedule">
         SELECT