|
@@ -72,6 +72,8 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
private MusicGroupDao musicGroupDao;
|
|
|
@Autowired
|
|
|
private ImFeignService imFeignService;
|
|
|
+ @Autowired
|
|
|
+ private StudentDao studentDao;
|
|
|
|
|
|
private static Map<Integer, Map<Integer, List<Integer>>> schoolSubjectTeachersMap;
|
|
|
|
|
@@ -578,13 +580,6 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
Integer practiceCourseMinutes = practiceCourseMinutesConfig.getParanValue(Integer.class);
|
|
|
List<Integer> teacherIds = new ArrayList<>();
|
|
|
|
|
|
-// boolean checkTeacherLeaveDate=true;
|
|
|
-// SysConfig teacherLeaveDataConfig = sysConfigService.findByParamName(SysConfigService.TEACHER_LEAVE_DATAS);
|
|
|
-// if (Objects.nonNull(teacherLeaveDataConfig.getParanValue())
|
|
|
-// &&StringUtils.isNotBlank(teacherLeaveDataConfig.getParanValue())){
|
|
|
-//
|
|
|
-// }
|
|
|
-
|
|
|
//如果是广州分部的,并且声部满足条件的需要特殊处理
|
|
|
if (sysUser.getOrganId().equals(GUANGZHOU_ORGAN_ID) && GUANGZHOU_SUBJECTIDS.contains(subjectId)) {
|
|
|
List<MusicGroup> userMusicGroups = musicGroupDao.findUserMusicGroups(userId);
|
|
@@ -861,6 +856,8 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
}
|
|
|
allCourseDates.sort(Comparator.comparing(Date::getTime));
|
|
|
|
|
|
+ studentDao.lockUser(practiceGroup.getStudentId());
|
|
|
+
|
|
|
Integer applyTimes = practiceGroupDao.countUserPracticeApplyRecord(practiceGroup.getStudentId());
|
|
|
|
|
|
if (applyTimes >= 1) {
|