|
@@ -3714,20 +3714,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
checkMergeClassSplitClassAffirmParam(mergeClassSplitClassAffirmDto);
|
|
checkMergeClassSplitClassAffirmParam(mergeClassSplitClassAffirmDto);
|
|
//如果缴费项目不需要审核,那么生成班级以及课表
|
|
//如果缴费项目不需要审核,那么生成班级以及课表
|
|
if(status == null || status != AUDITING){
|
|
if(status == null || status != AUDITING){
|
|
-
|
|
|
|
- ClassGroup4MixDto classGroup4MixDto = classGroup4MixDtos.get(0);
|
|
|
|
- classGroup4MixDto.setMusicGroupStudentClassAdjustId(musicGroupStudentClassAdjust.getId());
|
|
|
|
- //保存课程时长
|
|
|
|
- classGroup4MixDto.setClassCourseMinute(musicGroupStudentClassAdjust.getClassCourseMinute());
|
|
|
|
- //拷贝课程类型
|
|
|
|
- List<CourseTimeDto> courseTimeDtoList = classGroup4MixDto.getCourseTimeDtoList();
|
|
|
|
- List<CourseTimeDto> courseTimeDtoListBackup = Arrays.asList(new CourseTimeDto[courseTimeDtoList.size()]);
|
|
|
|
- Collections.copy(courseTimeDtoListBackup,courseTimeDtoList);
|
|
|
|
- //每种课程类型单独排课
|
|
|
|
- for (CourseTimeDto courseTimeDto : courseTimeDtoListBackup) {
|
|
|
|
- List<CourseTimeDto> courseTimeDtos = new ArrayList<>();
|
|
|
|
- courseTimeDtos.add(courseTimeDto);
|
|
|
|
- classGroup4MixDto.setCourseTimeDtoList(courseTimeDtos);
|
|
|
|
|
|
+ //每种课程类型单独进行排课
|
|
|
|
+ for (ClassGroup4MixDto classGroup4MixDto : classGroup4MixDtos) {
|
|
|
|
+ classGroup4MixDto.setMusicGroupStudentClassAdjustId(musicGroupStudentClassAdjust.getId());
|
|
|
|
+ classGroup4MixDto.setClassCourseMinute(musicGroupStudentClassAdjust.getClassCourseMinute());
|
|
classGroupService.classGroupAdjust2(classGroup4MixDto);
|
|
classGroupService.classGroupAdjust2(classGroup4MixDto);
|
|
}
|
|
}
|
|
//排课完成后删除所选课程
|
|
//排课完成后删除所选课程
|