|
@@ -107,7 +107,7 @@ public class RoomServiceImpl implements RoomService {
|
|
|
}catch (Exception e){
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
- roomId = "DAYA" + roomId;
|
|
|
+ roomId = "S" + roomId;
|
|
|
String display = "";
|
|
|
Date curTime = DateTimeUtils.currentUTC();
|
|
|
List<Room> roomList = roomDao.findByRid(roomId);
|
|
@@ -248,12 +248,12 @@ public class RoomServiceImpl implements RoomService {
|
|
|
SysUser user = sysUserFeignService.queryUserInfo();
|
|
|
String userId = user.getId().toString();
|
|
|
Teacher teacher = teacherDao.get(user.getId());
|
|
|
- CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId.substring(4)));
|
|
|
+ CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId.substring(1)));
|
|
|
try {
|
|
|
if(teacher != null && teacher.getId().equals(courseSchedule.getActualTeacherId())){
|
|
|
- teacherAttendanceService.addTeacherAttendanceRecord(Integer.parseInt(roomId.substring(4)),user.getId(), SignStatusEnum.SIGN_OUT,true);
|
|
|
+ teacherAttendanceService.addTeacherAttendanceRecord(Integer.parseInt(roomId.substring(1)),user.getId(), SignStatusEnum.SIGN_OUT,true);
|
|
|
}else {
|
|
|
- studentAttendanceService.addStudentAttendanceRecord(Integer.parseInt(roomId.substring(4)),user.getId(), StudentAttendanceStatusEnum.NORMAL,SignStatusEnum.SIGN_OUT);
|
|
|
+ studentAttendanceService.addStudentAttendanceRecord(Integer.parseInt(roomId.substring(1)),user.getId(), StudentAttendanceStatusEnum.NORMAL,SignStatusEnum.SIGN_OUT);
|
|
|
}
|
|
|
}catch (Exception e){
|
|
|
e.printStackTrace();
|
|
@@ -1136,12 +1136,12 @@ public class RoomServiceImpl implements RoomService {
|
|
|
// SysUser sysUser = sysUserFeignService.queryUserById(Integer.parseInt(userId));
|
|
|
SysUser sysUser = teacherDao.getUser(Integer.parseInt(userId));
|
|
|
Teacher teacher = teacherDao.get(sysUser.getId());
|
|
|
- CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId.substring(4)));
|
|
|
+ CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId.substring(1)));
|
|
|
try {
|
|
|
if(teacher != null && teacher.getId().equals(courseSchedule.getActualTeacherId())){
|
|
|
- teacherAttendanceService.addTeacherAttendanceRecord(Integer.parseInt(roomId.substring(4)),Integer.parseInt(userId), SignStatusEnum.SIGN_OUT,true);
|
|
|
+ teacherAttendanceService.addTeacherAttendanceRecord(Integer.parseInt(roomId.substring(1)),Integer.parseInt(userId), SignStatusEnum.SIGN_OUT,true);
|
|
|
}else {
|
|
|
- studentAttendanceService.addStudentAttendanceRecord(Integer.parseInt(roomId.substring(4)),Integer.parseInt(userId), StudentAttendanceStatusEnum.NORMAL,SignStatusEnum.SIGN_OUT);
|
|
|
+ studentAttendanceService.addStudentAttendanceRecord(Integer.parseInt(roomId.substring(1)),Integer.parseInt(userId), StudentAttendanceStatusEnum.NORMAL,SignStatusEnum.SIGN_OUT);
|
|
|
}
|
|
|
}catch (Exception e){
|
|
|
e.printStackTrace();
|