Merge remote-tracking branch 'origin/master'

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

@@ -1409,6 +1409,23 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         if (classGroup == null) {
             throw new BizException("班级不存在");
         }
+        if (classGroup4MixDto.getCourseAddType().equals("onlyUpdateTeacher")) {
+			List<Integer> classGroupIds = new ArrayList<Integer>();
+			classGroupIds.add(classGroupId);
+			// 删除历史记录
+			classGroupTeacherMapperDao.delClassGroupTeacherMapper(classGroupIds);
+
+			List<ClassGroupTeacherMapper> newTeacherMapperList = classGroup4MixDto.getClassGroupTeacherMapperList();
+			for (ClassGroupTeacherMapper tm : newTeacherMapperList) {
+				tm.setClassGroupId(classGroupId);
+				tm.setCreateTime(date);
+				tm.setGroupType(GroupType.MUSIC);
+				tm.setMusicGroupId(musicGroupId);
+				tm.setUpdateTime(date);
+				classGroupTeacherMapperDao.insert(tm);
+			}
+			return classGroup;
+		}
         if(classGroup4MixDto.getCourseTimes().compareTo(0) <= 0){
             throw new BizException("排课次数必须大于0");
         }
@@ -1426,22 +1443,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 teacherAttendanceDao.batchDeleteByCourseSchedules(courseScheduleIds);
                 courseScheduleStudentPaymentDao.deleteByCourseSchedule(courseScheduleIds);
             }
-		} else if (classGroup4MixDto.getCourseAddType().equals("onlyUpdateTeacher")) {
-			List<Integer> classGroupIds = new ArrayList<Integer>();
-			classGroupIds.add(classGroupId);
-			// 删除历史记录
-			classGroupTeacherMapperDao.delClassGroupTeacherMapper(classGroupIds);
-
-			List<ClassGroupTeacherMapper> newTeacherMapperList = classGroup4MixDto.getClassGroupTeacherMapperList();
-			for (ClassGroupTeacherMapper tm : newTeacherMapperList) {
-				tm.setClassGroupId(classGroupId);
-				tm.setCreateTime(date);
-				tm.setGroupType(GroupType.MUSIC);
-				tm.setMusicGroupId(musicGroupId);
-				tm.setUpdateTime(date);
-				classGroupTeacherMapperDao.insert(tm);
-			}
-			return classGroup;
 		}
 
         classGroupService.updateTotalClassTimes(classGroup.getId().longValue(),courseTimes);