update

edu-im/edu-im-server/src/main/java/com/keao/edu/im/service/Impl/RoomServiceImpl.java

@@ -131,7 +131,7 @@ public class RoomServiceImpl implements RoomService {
             }else if(isAssistant){
                 roleEnum = RoleEnum.AssistantTeacher;
             }else {
-                ExamRoomStudentRelation examRoomStudentRelation = eduUserFeignService.getExamRoomStudentRelation(examRoom.getExaminationBasicId(), roomId, sysUser.getId());
+                ExamRoomStudentRelation examRoomStudentRelation = eduUserFeignService.getExamRoomStudentRelation(examRoom.getExaminationBasicId().intValue(), roomId, sysUser.getId());
                 if(examRoomStudentRelation == null){
                     throw new BizException("学员考试数据异常");
                 }
@@ -154,7 +154,7 @@ public class RoomServiceImpl implements RoomService {
             RoomMember roomMember = memberList.get(0);
             roleEnum = RoleEnum.getEnumByValue(roomMember.getRole());
             if(roleEnum == Student){
-                ExamRoomStudentRelation examRoomStudentRelation = eduUserFeignService.getExamRoomStudentRelation(examRoom.getExaminationBasicId(), roomId, sysUser.getId());
+                ExamRoomStudentRelation examRoomStudentRelation = eduUserFeignService.getExamRoomStudentRelation(examRoom.getExaminationBasicId().intValue(), roomId, sysUser.getId());
                 if(examRoomStudentRelation == null){
                     throw new BizException("学员考试数据异常");
                 }
@@ -228,7 +228,7 @@ public class RoomServiceImpl implements RoomService {
             }
         }
         if(userId.equals(examRoom.getMainTeacherUserId()) || isAssistant){
-            TeacherAttendance attendance = teacherAttendanceDao.findByTeacherIdAndExaminationBasicIdAndExamRoomId(userId, examRoom.getExaminationBasicId(), examRoom.getId());
+            TeacherAttendance attendance = teacherAttendanceDao.findByTeacherIdAndExaminationBasicIdAndExamRoomId(userId, examRoom.getExaminationBasicId().intValue(), examRoom.getId());
             if(attendance != null){
                 return;
             }
@@ -238,10 +238,10 @@ public class RoomServiceImpl implements RoomService {
             teacherAttendance.setTeacherId(userId);
             teacherAttendance.setTenantId(examRoom.getTenantId());
             teacherAttendance.setCreateTime(date);
-            teacherAttendance.setExaminationBasicId(examRoom.getExaminationBasicId());
+            teacherAttendance.setExaminationBasicId(examRoom.getExaminationBasicId().intValue());
             teacherAttendanceDao.save(teacherAttendance);
         }else {
-            StudentAttendance attendance = studentAttendanceDao.findByUserIdAndExaminationBasicIdAndExamRoomId(userId, examRoom.getExaminationBasicId(), examRoom.getId());
+            StudentAttendance attendance = studentAttendanceDao.findByUserIdAndExaminationBasicIdAndExamRoomId(userId, examRoom.getExaminationBasicId().intValue(), examRoom.getId());
             if(attendance != null){
                 return;
             }
@@ -250,7 +250,7 @@ public class RoomServiceImpl implements RoomService {
             studentAttendance.setSignInTime(date);
             studentAttendance.setUserId(userId);
             studentAttendance.setCreateTime(date);
-            studentAttendance.setExaminationBasicId(examRoom.getExaminationBasicId());
+            studentAttendance.setExaminationBasicId(examRoom.getExaminationBasicId().intValue());
             studentAttendanceDao.save(studentAttendance);
         }
     }
@@ -271,7 +271,7 @@ public class RoomServiceImpl implements RoomService {
             }
         }
         if(userId.equals(examRoom.getMainTeacherUserId()) || isAssistant){
-            TeacherAttendance attendance = teacherAttendanceDao.findByTeacherIdAndExaminationBasicIdAndExamRoomId(userId, examRoom.getExaminationBasicId(), examRoom.getId());
+            TeacherAttendance attendance = teacherAttendanceDao.findByTeacherIdAndExaminationBasicIdAndExamRoomId(userId, examRoom.getExaminationBasicId().intValue(), examRoom.getId());
             if(attendance == null){
                 attendance = new TeacherAttendance();
                 attendance.setExamRoomId(examRoom.getId());
@@ -280,14 +280,14 @@ public class RoomServiceImpl implements RoomService {
                 attendance.setTeacherId(userId);
                 attendance.setTenantId(examRoom.getTenantId());
                 attendance.setCreateTime(date);
-                attendance.setExaminationBasicId(examRoom.getExaminationBasicId());
+                attendance.setExaminationBasicId(examRoom.getExaminationBasicId().intValue());
                 teacherAttendanceDao.save(attendance);
             }else {
                 attendance.setSignOutTime(date);
                 teacherAttendanceDao.saveAndFlush(attendance);
             }
         }else {
-            StudentAttendance attendance = studentAttendanceDao.findByUserIdAndExaminationBasicIdAndExamRoomId(userId, examRoom.getExaminationBasicId(), examRoom.getId());
+            StudentAttendance attendance = studentAttendanceDao.findByUserIdAndExaminationBasicIdAndExamRoomId(userId, examRoom.getExaminationBasicId().intValue(), examRoom.getId());
             if(attendance == null){
                 attendance = new StudentAttendance();
                 attendance.setExamRoomId(examRoom.getId());
@@ -295,7 +295,7 @@ public class RoomServiceImpl implements RoomService {
                 attendance.setSignOutTime(date);
                 attendance.setUserId(userId);
                 attendance.setCreateTime(date);
-                attendance.setExaminationBasicId(examRoom.getExaminationBasicId());
+                attendance.setExaminationBasicId(examRoom.getExaminationBasicId().intValue());
                 studentAttendanceDao.save(attendance);
             }else {
                 attendance.setSignOutTime(date);
@@ -1407,4 +1407,4 @@ public class RoomServiceImpl implements RoomService {
         }
         return result;
     }
-}
+}