update

mec-biz/src/main/java/com/ym/mec/biz/service/TeacherAttendanceService.java

@@ -110,4 +110,12 @@ public interface TeacherAttendanceService extends BaseService<Long, TeacherAtten
 	 * @param courseId
 	 */
 	void cleanCourseTeacherSignOut(Long courseId);
+
+	/**
+	 * 获取教师签到信息
+	 * @param courseId
+	 * @param teacherId
+	 * @return
+	 */
+	TeacherAttendance findByTeacherAttendanceInfo(Long courseId, Integer teacherId);
 }

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

@@ -351,7 +351,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 							//如果当前课程没有签退记录，那么正常更新
 							TeacherAttendance personalAttendance = teacherAttendanceDao.getTeacherPersonalAttendance(courseSchedules.get(i).getId().intValue());
 							if(personalAttendance != null && personalAttendance.getSignOutTime() != null){
-								break;
+								continue;
 							}
 							if(date.after(endDateTime)){
 								teacherAttendanceDao.cuntinueCourseSign(courseSchedules.get(i).getId(),signInTime,date,1);
@@ -507,4 +507,9 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 	public void cleanCourseTeacherSignOut(Long courseId) {
 		teacherAttendanceDao.cleanCourseTeacherSignOut(courseId);
 	}
+
+	@Override
+	public TeacherAttendance findByTeacherAttendanceInfo(Long courseId, Integer teacherId) {
+		return teacherAttendanceDao.findByTeacherAttendanceInfo(teacherId.longValue(),courseId);
+	}
 }

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

@@ -274,7 +274,7 @@ public class RoomServiceImpl implements RoomService {
                 //获取上一次课程
                 CourseSchedule lastCourse = courseScheduleDao.getLastCourse(courseSchedule.getClassGroupId(), classDate + " " + startClassTime, courseSchedule.getActualTeacherId(), continueCourseTime);
                 //获取当前课程的签退时间
-                TeacherAttendance teacherAttendance = teacherAttendanceService.getTeacherPersonalAttendance(lastCourse.getId().intValue());
+                TeacherAttendance teacherAttendance = teacherAttendanceService.findByTeacherAttendanceInfo(lastCourse.getId(),courseSchedule.getActualTeacherId());
                 //如果上次课签退时间和当前签到时间间隔小于等于5分钟，清除上一次课程的教师签退记录
                 Date signOutTime = teacherAttendance.getSignOutTime();
                 log.info("signOutTime: signOutTime={}, date={}", signOutTime, date);