|
@@ -16,6 +16,7 @@ import com.ym.mec.biz.dal.dao.CourseScheduleDao;
|
|
|
import com.ym.mec.biz.dal.dao.TeacherDao;
|
|
|
import com.ym.mec.biz.dal.entity.CourseSchedule;
|
|
|
import com.ym.mec.biz.dal.entity.Teacher;
|
|
|
+import com.ym.mec.biz.dal.enums.GroupType;
|
|
|
import com.ym.mec.biz.dal.enums.SignStatusEnum;
|
|
|
import com.ym.mec.biz.dal.enums.StudentAttendanceStatusEnum;
|
|
|
import com.ym.mec.biz.service.StudentAttendanceService;
|
|
@@ -106,23 +107,17 @@ public class RoomServiceImpl implements RoomService {
|
|
|
try {
|
|
|
if(teacher != null && teacher.getId().equals(courseSchedule.getActualTeacherId())){
|
|
|
teacherAttendanceService.addTeacherAttendanceRecord(Integer.parseInt(roomId),courseSchedule.getActualTeacherId(), SignStatusEnum.SIGN_IN,true);
|
|
|
- if(teacher.getTeacherOrganId() == lesseeOrganId){
|
|
|
- roomId = "I" + roomId;
|
|
|
- }else {
|
|
|
- roomId = "S" + roomId;
|
|
|
- }
|
|
|
}else {
|
|
|
studentAttendanceService.addStudentAttendanceRecord(Integer.parseInt(roomId),Integer.parseInt(userId), StudentAttendanceStatusEnum.NORMAL,SignStatusEnum.SIGN_IN);
|
|
|
- if(sysUser.getOrganId() == lesseeOrganId){
|
|
|
- roomId = "I" + roomId;
|
|
|
- }else {
|
|
|
- roomId = "S" + roomId;
|
|
|
- }
|
|
|
}
|
|
|
}catch (Exception e){
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
-// roomId = "DAYA" + roomId;
|
|
|
+ if(courseSchedule.getGroupType() == GroupType.COMM){
|
|
|
+ roomId = "I" + roomId;
|
|
|
+ }else {
|
|
|
+ roomId = "S" + roomId;
|
|
|
+ }
|
|
|
String display = "";
|
|
|
Date curTime = DateTimeUtils.currentUTC();
|
|
|
List<Room> roomList = roomDao.findByRid(roomId);
|