update

mec-biz/src/main/java/com/ym/mec/biz/service/CourseScheduleService.java

@@ -6,6 +6,7 @@ import com.ym.mec.biz.dal.dto.TeacherAttendanceDto;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.biz.dal.entity.CourseScheduleComplaints;
 import com.ym.mec.biz.dal.enums.AuditStatusEnum;
+import com.ym.mec.biz.dal.enums.CourseStatusEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.page.CourseScheduleQueryInfo;
@@ -45,6 +46,17 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
 	 */
 	void batchDeleteMusicGroupNotStartCourse(String musicGroupId);
 
+	/**
+	 * @describe
+	 * @author Joburgess
+	 * @date 2019/11/26
+	 * @param musicGroupId:
+	 * @param userId:
+	 * @param courseStatus:
+	 * @return void
+	 */
+	void batchDeleteMusicGroupCourseWithStudent(String musicGroupId, Integer userId, CourseStatusEnum courseStatus);
+
 
 	/**
 	 * @describe 判断该课程是否只能进行正常签到

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

@@ -52,10 +52,10 @@ public class CourseHomeworkServiceImpl extends BaseServiceImpl<Long, CourseHomew
 		int count = courseHomeworkDao.countByClassGroupAndTeacher(params);
 		if (count > 0) {
 			dataList = courseHomeworkDao.findByClassGroupAndTeacher(params);
-			List<Integer> courseScheduleIds=dataList.stream()
-					.map(TeacherHomeworkListDto::getCourseScheduleId)
-					.distinct()
-					.collect(Collectors.toList());
+//			List<Integer> courseScheduleIds=dataList.stream()
+//					.map(TeacherHomeworkListDto::getCourseScheduleId)
+//					.distinct()
+//					.collect(Collectors.toList());
 //			List<Map<Integer, Integer>> courseTimeByClassGroup = teacherAttendanceDao.findCourseTimeByCourseSchedules(courseScheduleIds);
 //			Map<Integer, Integer> map = MapUtil.convertIntegerMap(courseTimeByClassGroup);
 //			dataList.forEach(teacherHomeworkListDto -> {

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

@@ -135,6 +135,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 	}
 
 	@Override
+	public void batchDeleteMusicGroupCourseWithStudent(String musicGroupId, Integer userId, CourseStatusEnum courseStatus) {
+
+	}
+
+	@Override
 	public YesOrNoEnum enableOnlyNormalAttendance(Date startClassTime,Long userId,boolean checkSchool,Integer schoolId){
 		Date endTime=startClassTime;
 		Date startTime=DateUtil.addHours(endTime,-1);