|
@@ -342,12 +342,12 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
|
|
Date startDateTime = DateUtil.stringToDate(courseClassDate + " " + courseStartDateTime, DateUtil.EXPANDED_DATE_TIME_FORMAT);
|
|
Date startDateTime = DateUtil.stringToDate(courseClassDate + " " + courseStartDateTime, DateUtil.EXPANDED_DATE_TIME_FORMAT);
|
|
Date endDateTime = DateUtil.stringToDate(courseClassDate + " " + courseEndDateTime, DateUtil.EXPANDED_DATE_TIME_FORMAT);
|
|
Date endDateTime = DateUtil.stringToDate(courseClassDate + " " + courseEndDateTime, DateUtil.EXPANDED_DATE_TIME_FORMAT);
|
|
Date signOutTime = date;
|
|
Date signOutTime = date;
|
|
- if(i < courseSchedules.size() - 1 && date.before(endDateTime)){
|
|
|
|
|
|
+ if(i < courseSchedules.size() - 1 && date.after(endDateTime)){
|
|
//不是最后一节连堂课,并且签退时间大于课程结束时间,签退时间等于课程结束时间
|
|
//不是最后一节连堂课,并且签退时间大于课程结束时间,签退时间等于课程结束时间
|
|
signOutTime = endDateTime;
|
|
signOutTime = endDateTime;
|
|
}
|
|
}
|
|
//如果签退时间大于课程结束时间
|
|
//如果签退时间大于课程结束时间
|
|
- if(date.before(endDateTime)){
|
|
|
|
|
|
+ if(date.after(endDateTime)){
|
|
teacherAttendanceDao.cuntinueCourseSign(courseSchedules.get(i).getId(),startDateTime,signOutTime,1);
|
|
teacherAttendanceDao.cuntinueCourseSign(courseSchedules.get(i).getId(),startDateTime,signOutTime,1);
|
|
}else if (date.equals(endDateTime)){
|
|
}else if (date.equals(endDateTime)){
|
|
teacherAttendanceDao.cuntinueCourseSign(courseSchedules.get(i).getId(),startDateTime,signOutTime,1);
|
|
teacherAttendanceDao.cuntinueCourseSign(courseSchedules.get(i).getId(),startDateTime,signOutTime,1);
|