Merge remote-tracking branch 'origin/master'

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

@@ -326,7 +326,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 					}
 				}
 				if(courseSchedules.size() > 0){
-					//获取总上课时长(当前时间减去第一节课上课时间)
+					//获取总上课时长
 					int totalMinutes = DateUtil.minutesBetween(classStartDateTime, date);
 					//减去第一节课时长
 					int firstMinutes = courseScheduleDao.getSingleClassMinutes(courseScheduleId.longValue());

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -2208,9 +2208,9 @@
         SELECT cs.* FROM course_schedule cs
         LEFT JOIN teacher_attendance ta ON cs.id_ = ta.course_schedule_id_
         WHERE (UNIX_TIMESTAMP(CONCAT(cs.class_date_,' ',cs.start_class_time_)) -
-        UNIX_TIMESTAMP(CONCAT(#{courseSchedule.classDate},' ',#{courseSchedule.endClassTime}))) >= 60 * #{continueCourseTime}
-        AND cs.teacher_id_ = #{courseSchedule.teacherId} AND cs.class_group_id_ = #{courseSchedule.id}
-        AND ta.sign_in_time_ IS NULL AND ta.sign_out_time_ IS NULL
+        UNIX_TIMESTAMP(CONCAT(#{courseSchedule.classDate},' ',#{courseSchedule.endClassTime}))) <= 60 * #{continueCourseTime}
+        AND cs.teacher_id_ = #{courseSchedule.teacherId} AND cs.class_group_id_ = #{courseSchedule.classGroupId}
+        AND ta.sign_in_time_ IS NULL AND ta.sign_out_time_ IS NULL LIMIT 1
     </select>
     <select id="getSingleClassMinutes" resultType="java.lang.Integer">
         SELECT FLOOR((UNIX_TIMESTAMP(CONCAT(cs.class_date_,' ',cs.end_class_time_)) -