|
@@ -499,7 +499,7 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
|
|
//获取当前课程的所有连堂课列表
|
|
//获取当前课程的所有连堂课列表
|
|
String courseClassDate = DateUtil.format(cs.getClassDate(), DateUtil.DEFAULT_PATTERN);
|
|
String courseClassDate = DateUtil.format(cs.getClassDate(), DateUtil.DEFAULT_PATTERN);
|
|
String courseEndDateTime = DateUtil.format(cs.getEndClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
|
|
String courseEndDateTime = DateUtil.format(cs.getEndClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
|
|
- cs = courseScheduleDao.queryContinueCourse(cs,continueCourseTime,courseClassDate + " " + courseEndDateTime);
|
|
|
|
|
|
+ cs = courseScheduleDao.queryRepairContinueCourse(cs,continueCourseTime,courseClassDate + " " + courseEndDateTime);
|
|
//存在连堂课
|
|
//存在连堂课
|
|
if(cs != null){
|
|
if(cs != null){
|
|
courseSchedules.add(cs);
|
|
courseSchedules.add(cs);
|
|
@@ -555,10 +555,9 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- }else {
|
|
|
|
- studentAttendance.setStatus(statusEnum);
|
|
|
|
- studentAttendance.setSignOutTime(date);
|
|
|
|
}
|
|
}
|
|
|
|
+ studentAttendance.setStatus(statusEnum);
|
|
|
|
+ studentAttendance.setSignOutTime(date);
|
|
}
|
|
}
|
|
studentAttendanceDao.update(studentAttendance);
|
|
studentAttendanceDao.update(studentAttendance);
|
|
}
|
|
}
|