Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -90,6 +90,9 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 		if(Objects.isNull(courseSchedule)){
 			throw new BizException("请指定课程");
 		}
+		if(TeachModeEnum.ONLINE.equals(courseSchedule.getTeachMode())){
+			throw new BizException("线上课程请进入房间授课");
+		}
 		Date date = new Date();
 		SysConfig attendanceTimeRange;
 		if(courseSchedule.getGroupType().equals(GroupType.MUSIC)){
@@ -203,8 +206,6 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 			teacherAttendance= new TeacherAttendance();
 			teacherAttendance.setTeacherId(sysUser.getId());
 			teacherAttendance.setCreateTime(date);
-		}else if(teacherAttendance.getSignInTime() != null && teacherAttendance.getSignOutTime() != null){
-			return;
 		}
 
 		teacherAttendance.setSignInTime(courseSchedule.getStartClassTime());

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

@@ -129,6 +129,9 @@ public class RoomServiceImpl implements RoomService {
         String userId = sysUser.getId().toString();
         Teacher teacher = teacherDao.get(Integer.parseInt(userId));
         CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId));
+        if(courseSchedule.getTeachMode() == TeachModeEnum.OFFLINE){
+            throw new BizException("加入失败：线下课不允许此操作");
+        }
         if(teacher != null && userId.equals(courseSchedule.getActualTeacherId())){
             courseScheduleStudentPaymentDao.adjustPlayMidi(Long.parseLong(roomId),null,null);
             userName = sysUser.getRealName();
@@ -1510,4 +1513,4 @@ public class RoomServiceImpl implements RoomService {
         }
         return result;
     }
-}
+}