|
@@ -296,6 +296,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
//LocalDateTime now = LocalDateTime.ofInstant(highClassGroup.getStartDate().toInstant(), ZoneId.systemDefault());
|
|
|
LocalDateTime now = LocalDate.parse(highClassGroup.getStartDate(), DateTimeFormatter.ofPattern("yyyy-MM-dd")).atStartOfDay();
|
|
|
|
|
|
+
|
|
|
+ List<Subject> subjectList = subjectService.findBySubjectByIdList(highClassGroup.getSubjectIdList());
|
|
|
+
|
|
|
+ String courseScheduleName = subjectList.stream().map(subject -> subject.getName()).collect(Collectors.joining("/"));
|
|
|
+
|
|
|
while (true) {
|
|
|
int dayOfWeek = now.getDayOfWeek().getValue();
|
|
|
if (highClassGroup.getDayOfWeek().equals(dayOfWeek)) {
|
|
@@ -317,9 +322,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
courseSchedule.setUpdateTime(date);
|
|
|
courseSchedule.setTeachMode(TeachModeEnum.OFFLINE);
|
|
|
courseSchedule.setType(CourseSchedule.CourseScheduleType.HIGH);
|
|
|
- Subject subject = subjectService.get(Integer.parseInt(highClassGroup.getSubjectIdList()));
|
|
|
- courseSchedule.setName(subject.getName() + "-" + CourseSchedule.CourseScheduleType.HIGH.getMsg());
|
|
|
-
|
|
|
+ courseSchedule.setName(courseScheduleName + "-" + CourseSchedule.CourseScheduleType.HIGH.getMsg());
|
|
|
courseScheduleList.add(courseSchedule);
|
|
|
times++;
|
|
|
}
|
|
@@ -328,6 +331,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
+ //检测新排课冲突
|
|
|
+ courseScheduleService.checkNewCourseSchedules(courseScheduleList,false);
|
|
|
courseScheduleDao.batchAddCourseSchedules(courseScheduleList);
|
|
|
List<ImGroupMember> groupMembers = musicGroupService.queryMusicGroupTeachers(highClassGroup.getMusicGroupId());
|
|
|
groupMembers.add(new ImGroupMember(classGroupTeacherMapper.getUserId().toString()));
|
|
@@ -418,8 +423,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
|
|
|
List<ClassGroupTeacherMapper> classGroupTeacherMapperList = classGroupTeacherMapperService.findClassGroupTeachers(classGroupAndTeachersList);
|
|
|
//获取当前乐团的合奏班id列表map
|
|
|
- HashMap<Integer,Integer> idMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(classGroupRelationDao.queryClassRelationIdMap(musicGroupId))), HashMap.class);
|
|
|
- HashMap<Integer,String> nameMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(classGroupRelationDao.queryClassRelationNameMap(musicGroupId))), HashMap.class);
|
|
|
+ HashMap<Integer, Integer> idMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(classGroupRelationDao.queryClassRelationIdMap(musicGroupId))), HashMap.class);
|
|
|
+ HashMap<Integer, String> nameMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(classGroupRelationDao.queryClassRelationNameMap(musicGroupId))), HashMap.class);
|
|
|
|
|
|
for (ClassGroupTeachersDto classGroupAndTeachers : classGroupAndTeachersList) {
|
|
|
List<ClassGroupTeacherMapper> oneClassGroupTeacherMapperList = new ArrayList<>();
|
|
@@ -448,7 +453,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
//获取老师的默认课酬
|
|
|
String courseType = classGroupAndTeacher.getType().equals(ClassGroupTypeEnum.NORMAL) ? "SINGLE" : classGroupAndTeacher.getType().getCode();
|
|
|
|
|
|
- if(musicGroup.getSettlementType().equals(SalarySettlementTypeEnum.CLASSROOM_SALARY)){
|
|
|
+ if (musicGroup.getSettlementType().equals(SalarySettlementTypeEnum.CLASSROOM_SALARY)) {
|
|
|
courseType = "CLASSROOM";
|
|
|
}
|
|
|
|