Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherAttendanceServiceImpl.java

@@ -318,15 +318,15 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			teacherAttendance.setSignOutTime(date);
 			teacherAttendanceDao.update(teacherAttendance);
 			//教师签退后，给未签到学员添加旷课记录
-			List<StudentAttendance> studentAttendances = studentAttendanceDao.queryNoSignStudentRecord(courseScheduleId);
-			if(studentAttendances != null && studentAttendances.size() > 0){
-				studentAttendances.forEach(e->{
-					e.setTeacherId(userId);
-					e.setStatus(StudentAttendanceStatusEnum.TRUANT);
-					e.setRemark("学员未到，自动补旷课");
-				});
-				studentAttendanceDao.addStudentAttendances(studentAttendances);
-			}
+//			List<StudentAttendance> studentAttendances = studentAttendanceDao.queryNoSignStudentRecord(courseScheduleId);
+//			if(studentAttendances != null && studentAttendances.size() > 0){
+//				studentAttendances.forEach(e->{
+//					e.setTeacherId(userId);
+//					e.setStatus(StudentAttendanceStatusEnum.TRUANT);
+//					e.setRemark("学员未到，自动补旷课");
+//				});
+//				studentAttendanceDao.addStudentAttendances(studentAttendances);
+//			}
 		}
 	}
 

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

@@ -148,10 +148,10 @@ public class RoomServiceImpl implements RoomService {
             } else {
                 roleEnum = RoleEnum.RoleAudience;
             }*/
-            if(teacher == null){
-                roleEnum = RoleEnum.RoleStudent;
-            }else {
+            if(teacher != null && teacher.getId() == courseSchedule.getActualTeacherId()){
                 roleEnum = RoleEnum.RoleTeacher;
+            }else {
+                roleEnum = RoleEnum.RoleStudent;
             }
             saveRoomMember(userId, userName, roomId, roleEnum.getValue(), !isDisableCamera, curTime);
             IMApiResultInfo resultInfo = imHelper.joinGroup(new String[]{userId}, roomId, roomId);
@@ -1139,12 +1139,13 @@ public class RoomServiceImpl implements RoomService {
         if(byRidAndUid.size() > 0){
             SysUser sysUser = sysUserFeignService.queryUserById(Integer.parseInt(userId));
             Teacher teacher = teacherDao.get(sysUser.getId());
-            if(teacher != null){
-                try {
-                    teacherAttendanceService.addTeacherAttendanceRecord(Integer.parseInt(roomId.substring(4)),sysUser.getId(), SignStatusEnum.SIGN_OUT,true);
-                }catch (Exception e){
-                    e.printStackTrace();
+            CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId));
+            try {
+                if(teacher != null && teacher.getId() == courseSchedule.getActualTeacherId()){
+                    teacherAttendanceService.addTeacherAttendanceRecord(Integer.parseInt(roomId.substring(4)),Integer.parseInt(userId), SignStatusEnum.SIGN_OUT,true);
                 }
+            }catch (Exception e){
+                e.printStackTrace();
             }
             List<Room> roomList = roomDao.findByRid(roomId);
             if (roomList.size() == 0) {