update

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleDao.java

@@ -1087,7 +1087,7 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      * @return
      */
     CourseSchedule queryContinueCourse(@Param("courseSchedule")CourseSchedule courseSchedule,
-                                @Param("continueCourseTime")String continueCourseTime);
+                                @Param("continueCourseTime")String continueCourseTime,@Param("endDateTime")String endDateTime);
 
     /**
      * 获取单节课时长

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

@@ -317,7 +317,10 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 				CourseSchedule cs = courseSchedule;
 				while (true){
 					//获取当前课程的所有连堂课列表
-					cs = courseScheduleDao.queryContinueCourse(courseSchedule,continueCourseTime);
+					String courseClassDate = DateUtil.format(cs.getClassDate(), DateUtil.DEFAULT_PATTERN);
+					String courseEndDateTime = DateUtil.format(cs.getEndClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
+//					Date endDateTime = DateUtil.stringToDate(courseClassDate + " " + courseEndDateTime, DateUtil.EXPANDED_DATE_TIME_FORMAT);
+					cs = courseScheduleDao.queryContinueCourse(cs,continueCourseTime,courseClassDate + " " + courseEndDateTime);
 					//存在连堂课
 					if(cs != null){
 						courseSchedules.add(cs);
@@ -341,8 +344,8 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 						if(totalMinutes >= 0){
 							//补充签到签退时间
 							courseClassDate = DateUtil.format(e.getClassDate(), DateUtil.DEFAULT_PATTERN);
-							courseStartDateTime = DateUtil.format(e.getStartClassTime(), DateUtil.DEFAULT_PATTERN);
-							courseEndDateTime = DateUtil.format(e.getEndClassTime(), DateUtil.DEFAULT_PATTERN);
+							courseStartDateTime = DateUtil.format(e.getStartClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
+							courseEndDateTime = DateUtil.format(e.getEndClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
 							Date startDateTime = DateUtil.stringToDate(courseClassDate + " " + courseStartDateTime, DateUtil.EXPANDED_DATE_TIME_FORMAT);
 							Date endDateTime = DateUtil.stringToDate(courseClassDate + " " + courseEndDateTime, DateUtil.EXPANDED_DATE_TIME_FORMAT);
 							teacherAttendanceDao.cuntinueCourseSign(e.getId(),startDateTime,endDateTime);

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

@@ -2208,7 +2208,7 @@
         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}
+        UNIX_TIMESTAMP(#{endDateTime})) <= 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>