|
@@ -288,13 +288,18 @@ public class RoomServiceImpl implements RoomService {
|
|
}
|
|
}
|
|
}else{
|
|
}else{
|
|
StudentAttendance statusAndCourseScheduleId = studentAttendanceService.findByStatusAndCourseScheduleId(lastCourse.getId(), userId);
|
|
StudentAttendance statusAndCourseScheduleId = studentAttendanceService.findByStatusAndCourseScheduleId(lastCourse.getId(), userId);
|
|
- Date signOutTime = statusAndCourseScheduleId.getSignOutTime();
|
|
|
|
- log.info("studentSignOutTime: signOutTime={}, date={}", signOutTime, date);
|
|
|
|
- if(signOutTime != null && DateUtil.minutesBetween(signOutTime,date) <= Integer.parseInt(continueCourseTime)){
|
|
|
|
- studentAttendanceService.cleanCourseStudentSignOut(lastCourse.getId(), userId);
|
|
|
|
- }else {
|
|
|
|
- //如果大于5分钟,不换课堂,对当前课程进行签到
|
|
|
|
|
|
+ if(statusAndCourseScheduleId == null){
|
|
studentAttendanceService.addStudentAttendanceRecord(signInRoomId.intValue(),userId, StudentAttendanceStatusEnum.NORMAL,SignStatusEnum.SIGN_IN);
|
|
studentAttendanceService.addStudentAttendanceRecord(signInRoomId.intValue(),userId, StudentAttendanceStatusEnum.NORMAL,SignStatusEnum.SIGN_IN);
|
|
|
|
+ return;
|
|
|
|
+ }else {
|
|
|
|
+ Date signOutTime = statusAndCourseScheduleId.getSignOutTime();
|
|
|
|
+ log.info("studentSignOutTime: signOutTime={}, date={}", signOutTime, date);
|
|
|
|
+ if(signOutTime != null && DateUtil.minutesBetween(signOutTime,date) <= Integer.parseInt(continueCourseTime)){
|
|
|
|
+ studentAttendanceService.cleanCourseStudentSignOut(lastCourse.getId(), userId);
|
|
|
|
+ }else {
|
|
|
|
+ //如果大于5分钟,不换课堂,对当前课程进行签到
|
|
|
|
+ studentAttendanceService.addStudentAttendanceRecord(signInRoomId.intValue(),userId, StudentAttendanceStatusEnum.NORMAL,SignStatusEnum.SIGN_IN);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|