Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -1760,9 +1760,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 						insertCourseScheduleStudentPaymentList.add(sp);
 					}
 				}
-				
-				//清理课程作业
-				courseHomeworkService.delHomwworkByCourseScheduleId(courseScheduleId);
 			}
 			
 			if ((newCourseSchedule.getStatus() != oldCourseSchedule.getStatus() && newCourseSchedule.getStatus() == CourseStatusEnum.NOT_START)) {

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

@@ -386,7 +386,8 @@
     </select>
     
     <select id="queryNewStudentListByCourseScheduleId" resultMap="ClassGroupStudentMapper">
-       SELECT cgsm.* FROM class_group_student_mapper cgsm LEFT JOIN course_schedule_student_payment cssp on cssp.class_group_id_ = cgsm.class_group_id_ and cssp.user_id_ = cgsm.user_id_ 
+      	SELECT cgsm.* FROM class_group_student_mapper cgsm LEFT JOIN course_schedule cs ON cgsm.class_group_id_= cs.class_group_id_
+		LEFT JOIN course_schedule_student_payment cssp on cssp.course_schedule_id_ = cs.id_ and cssp.user_id_ = cgsm.user_id_
 		WHERE cssp.id_ IS NULL AND cgsm.status_ != 'QUIT' and cssp.course_schedule_id_ = #{courseScheduleId}
     </select>
 </mapper>