|
@@ -78,14 +78,14 @@ public class CourseScheduleConvertServiceImpl implements CourseScheduleConvertSe
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public HttpResponseResult action(List<ClassGroupDto> classGroups) {
|
|
|
ClassGroupDto classGroupDto = classGroups.get(0);
|
|
|
- List<Long> oldCourseIdList = Arrays.stream(classGroupDto.getCourseIds().split(",")).map(id -> Long.parseLong(id)).collect(Collectors.toList());
|
|
|
+ List<Long> oldCourseIdList = Arrays.stream(classGroupDto.getCourseIds().split(",")).map(Long::parseLong).collect(Collectors.toList());
|
|
|
//校验课程是否可以进行转换
|
|
|
this.checkConvertCourseIds(oldCourseIdList);
|
|
|
if(!classGroupDto.getConfirmGenerate()){
|
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
}
|
|
|
//校验主教助教是否冲突
|
|
|
- classGroups.stream().forEach(e->classGroupTeacherMapperService.checkTeachingBishop(e.getClassGroupTeacherMapperList()));
|
|
|
+ classGroups.forEach(e->classGroupTeacherMapperService.checkTeachingBishop(e.getClassGroupTeacherMapperList()));
|
|
|
int classNum = classGroups.size();
|
|
|
//课程列表
|
|
|
List<CourseSchedule> courseScheduleList = new ArrayList<>();
|
|
@@ -96,7 +96,7 @@ public class CourseScheduleConvertServiceImpl implements CourseScheduleConvertSe
|
|
|
List<Integer> studentIdList = new ArrayList<>();
|
|
|
|
|
|
for (ClassGroupDto groupDto : classGroups) {
|
|
|
- List<Integer> userIdStrSet = Arrays.stream(groupDto.getUserIds().split(",")).map(id -> Integer.valueOf(id)).collect(Collectors.toList());
|
|
|
+ List<Integer> userIdStrSet = Arrays.stream(groupDto.getUserIds().split(",")).map(Integer::valueOf).collect(Collectors.toList());
|
|
|
studentIdList.addAll(userIdStrSet);
|
|
|
groupDto.setStudentNum(userIdStrSet.size());
|
|
|
//创建班级
|
|
@@ -125,7 +125,7 @@ public class CourseScheduleConvertServiceImpl implements CourseScheduleConvertSe
|
|
|
courseScheduleStudentPayments.addAll(groupDto.getCourseScheduleStudentPayments());
|
|
|
}else {
|
|
|
List<CourseSchedule> schedules = result.getData();
|
|
|
- List<Integer> teacherIdList = schedules.stream().map(e -> e.getActualTeacherId()).collect(Collectors.toList());
|
|
|
+ List<Integer> teacherIdList = schedules.stream().map(CourseSchedule::getActualTeacherId).collect(Collectors.toList());
|
|
|
Map<Integer, String> maps = MapUtil.convertIntegerMap(teacherDao.queryNameByIdList(teacherIdList));
|
|
|
for (CourseSchedule e : schedules) {e.setActualTeacherName(maps.get(e.getActualTeacherId()));}
|
|
|
return result;
|