zouxuan 5 年之前
父节点
当前提交
d1f3908750
共有 1 个文件被更改,包括 11 次插入6 次删除
  1. 11 6
      mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

+ 11 - 6
mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -288,13 +288,18 @@ public class RoomServiceImpl implements RoomService {
                 }
             }else{
                 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);
+                    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);
+                    }
                 }
             }
         }