Browse Source

1、超级管理员课表预览bug修复
2、连堂课条件判断逻辑调整
3、vip课教师不做异常签到、签退判断
4、课程调整,如果调整时间大于当前时间,则清空之前的签到信息
5、VIP课学员复学增加时间限制

Joburgess 5 years ago
parent
commit
309a9bcc20

+ 3 - 3
mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -1437,9 +1437,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			throw new BizException("请指定小课与学生");
 		}
 		Date now=new Date();
-		if(studentRecoverInfo.getCourseCreateStartTime().before(now)){
-			throw new BizException("排课起始时间不得小于当前时间");
-		}
 		VipGroup vipGroup=vipGroupDao.get(studentRecoverInfo.getVipGroupId().longValue());
 		if(Objects.isNull(vipGroup)){
 			throw new BizException("指定的课程不存在");
@@ -1497,6 +1494,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			studentRecoverInfo.setCourseCount(teachModeSequence1.length);
 			List<CourseSchedule> newCourseSchedules = courseScheduleService.createCourses(studentRecoverInfo);
 			for(int i=0;i<newCourseSchedules.size();i++){
+				if(newCourseSchedules.get(i).getStartClassTime().before(now)){
+					throw new BizException("排课起始时间不得小于当前时间");
+				}
 				newCourseSchedules.get(i).setGroupType(GroupType.VIP);
 				newCourseSchedules.get(i).setMusicGroupId(vipGroup.getId().toString());
 				newCourseSchedules.get(i).setClassGroupId(classGroup.getId());