|
@@ -635,10 +635,14 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
classGroupIds=new ArrayList<>(temp);
|
|
|
Map<Integer,String> classIdSubjectNameMap=convertToMap(courseScheduleDao.findClassSubjects(classGroupIds));
|
|
|
courseSchedules.forEach(courseSchedule -> {
|
|
|
- StringBuilder className=new StringBuilder(classIdSubjectNameMap.get(courseSchedule.getClassGroupId()));
|
|
|
- className.append("-");
|
|
|
- className.append(courseSchedule.getType().getMsg());
|
|
|
- courseSchedule.setName(className.toString());
|
|
|
+ if(courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.MIX)){
|
|
|
+ courseSchedule.setName(courseSchedule.getType().getCode());
|
|
|
+ }else{
|
|
|
+ StringBuilder className=new StringBuilder(classIdSubjectNameMap.get(courseSchedule.getClassGroupId()));
|
|
|
+ className.append("-");
|
|
|
+ className.append(courseSchedule.getType().getMsg());
|
|
|
+ courseSchedule.setName(className.toString());
|
|
|
+ }
|
|
|
courseSchedule.setStatus(CourseStatusEnum.NOT_START);
|
|
|
});
|
|
|
}
|