|
@@ -1866,7 +1866,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
|
|
|
CourseSchedule courseSchedule = new CourseSchedule();
|
|
|
courseSchedule.setSchoolId(schoolId);
|
|
|
- courseSchedule.setName(classGroup.getName());
|
|
|
courseSchedule.setClassGroupId(classGroup.getId());
|
|
|
courseSchedule.setStatus(CourseStatusEnum.NOT_START);
|
|
|
courseSchedule.setClassDate(classDate);
|
|
@@ -1877,8 +1876,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
courseSchedule.setTeachMode(teachMode);
|
|
|
courseSchedule.setMusicGroupId(classGroup.getMusicGroupId());
|
|
|
courseSchedule.setType(classGroup4MixDto.getCourseType());
|
|
|
- if (classGroup4MixDto.getCourseType().equals(CourseSchedule.CourseScheduleType.MIX)) {
|
|
|
- courseSchedule.setName(classGroup4MixDto.getCourseType().getMsg());
|
|
|
+ if (!StringUtils.isBlank(classGroup.getName())) {
|
|
|
+ courseSchedule.setName(classGroup.getName());
|
|
|
} else {
|
|
|
courseSchedule.setName(subjectNames + "-" + classGroup4MixDto.getCourseType().getMsg());
|
|
|
}
|