|
@@ -1793,7 +1793,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
SysUser sysUser = sysUserFeignService.queryUserById(practiceGroup.getStudentId());
|
|
|
|
|
|
practiceGroup.setCoursesStartDate(allCourseDates.get(0));
|
|
|
- practiceGroup.setCoursesExpireDate(courseExpireDate);
|
|
|
+ practiceGroup.setCoursesExpireDate(allCourseDates.get(3));
|
|
|
Teacher teacher = teacherService.getDetail(practiceGroup.getUserId());
|
|
|
if (Objects.isNull(teacher)) {
|
|
|
throw new BizException("老师不存在");
|
|
@@ -3016,8 +3016,8 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
teacherAttendanceDao.batchInsert(teacherAttendances);
|
|
|
|
|
|
try {
|
|
|
-// courseScheduleService.checkNewCourseSchedules(practiceCourses,false);
|
|
|
- courseScheduleService.checkNewCourseSchedulesWithoutMusicGroup(practiceCourses,false);
|
|
|
+ courseScheduleService.checkNewCourseSchedules(practiceCourses,false);
|
|
|
+// courseScheduleService.checkNewCourseSchedulesWithoutMusicGroup(practiceCourses,false);
|
|
|
} catch (Exception e) {
|
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
String errMessage=new String();
|