zouxuan 5 years ago
parent
commit
5553b1f60e

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

@@ -2528,8 +2528,8 @@
         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(#{endDateTime})) >= 0
-          AND (UNIX_TIMESTAMP(CONCAT(cs.class_date_, ' ', cs.start_class_time_)) - UNIX_TIMESTAMP(#{endDateTime})) <=
+        WHERE TIMESTAMPDIFF(MINUTE,CONCAT(cs.class_date_,' ',cs.start_class_time_),#{endDateTime}) >= 0
+          AND TIMESTAMPDIFF(MINUTE,CONCAT(cs.class_date_,' ',cs.start_class_time_),#{endDateTime}) <=
               60 * #{continueCourseTime}
           AND cs.teacher_id_ = #{courseSchedule.teacherId}
           AND cs.class_group_id_ = #{courseSchedule.classGroupId}
@@ -2541,9 +2541,8 @@
         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(#{endDateTime})) >= 0
-          AND (UNIX_TIMESTAMP(CONCAT(cs.class_date_, ' ', cs.start_class_time_)) - UNIX_TIMESTAMP(#{endDateTime})) <=
-              60 * #{continueCourseTime}
+        WHERE TIMESTAMPDIFF(MINUTE,CONCAT(cs.class_date_,' ',cs.start_class_time_),#{endDateTime}) >= 0
+          AND TIMESTAMPDIFF(MINUTE,CONCAT(cs.class_date_,' ',cs.start_class_time_),#{endDateTime}) <= #{continueCourseTime}
           AND cs.teacher_id_ = #{courseSchedule.teacherId}
           AND cs.class_group_id_ = #{courseSchedule.classGroupId}
         LIMIT 1