|
@@ -150,13 +150,12 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
|
|
throw new BizException("乐团课禁止跨天点名");
|
|
throw new BizException("乐团课禁止跨天点名");
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
- SysConfig beforeAttendanceTimeRange = sysConfigService.findByParamName(SysConfigService.ENABLE_STUDENT_ATTENDANCE_BEFOR_COURSE_START_TIME_RANGE_VIP);
|
|
|
|
|
|
+ SysConfig beforeAttendanceTimeRange = sysConfigService.findByParamName(SysConfigService.ENABLE_STUDENT_ATTENDANCE_TIME_RANGE_VIP);
|
|
int courseStartTime = DateUtil.minutesBetween(date, courseSchedule.getStartClassTime());
|
|
int courseStartTime = DateUtil.minutesBetween(date, courseSchedule.getStartClassTime());
|
|
if (date.before(courseSchedule.getStartClassTime()) && courseStartTime > beforeAttendanceTimeRange.getParanValue(Integer.class)) {
|
|
if (date.before(courseSchedule.getStartClassTime()) && courseStartTime > beforeAttendanceTimeRange.getParanValue(Integer.class)) {
|
|
throw new BizException("VIP课开课前{}分钟禁止点名", beforeAttendanceTimeRange.getParanValue(Integer.class));
|
|
throw new BizException("VIP课开课前{}分钟禁止点名", beforeAttendanceTimeRange.getParanValue(Integer.class));
|
|
}
|
|
}
|
|
- attendanceTimeRange = sysConfigService.findByParamName(SysConfigService.ENABLE_STUDENT_ATTENDANCE_BEFOR_COURSE_START_TIME_RANGE_VIP);
|
|
|
|
-
|
|
|
|
|
|
+ attendanceTimeRange = sysConfigService.findByParamName(SysConfigService.ENABLE_STUDENT_ATTENDANCE_TIME_RANGE_VIP);
|
|
int courseEndTime = DateUtil.minutesBetween(courseSchedule.getEndClassTime(), date);
|
|
int courseEndTime = DateUtil.minutesBetween(courseSchedule.getEndClassTime(), date);
|
|
if (date.after(courseSchedule.getEndClassTime()) && courseEndTime > attendanceTimeRange.getParanValue(Integer.class)) {
|
|
if (date.after(courseSchedule.getEndClassTime()) && courseEndTime > attendanceTimeRange.getParanValue(Integer.class)) {
|
|
throw new BizException("VIP课结束{}分钟后禁止点名",attendanceTimeRange.getParanValue(Integer.class));
|
|
throw new BizException("VIP课结束{}分钟后禁止点名",attendanceTimeRange.getParanValue(Integer.class));
|