|
|
@@ -268,7 +268,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
|
|
|
Date classStartDateTime = DateUtil.stringToDate(classDate + " " + startClassTime, DateUtil.EXPANDED_DATE_TIME_FORMAT);
|
|
|
Date classEndDateTime = DateUtil.stringToDate(classDate + " " + endClassTime, DateUtil.EXPANDED_DATE_TIME_FORMAT);
|
|
|
// Date classEndDateAdd60Minutes = DateUtil.addMinutes(classEndDateTime, 60);
|
|
|
- Date classEndDateCut10Minutes = DateUtil.addMinutes(classEndDateTime, -10);
|
|
|
+// Date classEndDateCut10Minutes = DateUtil.addMinutes(classEndDateTime, -10);
|
|
|
// Date add20Minutes = DateUtil.addMinutes(classStartDateTime, advanceSignMinutes * -1);
|
|
|
// Date add60Minutes = DateUtil.addMinutes(classStartDateTime, -60);
|
|
|
//签到
|
|
|
@@ -310,7 +310,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
|
|
|
}
|
|
|
//签退
|
|
|
if(SignStatusEnum.SIGN_OUT.equals(signStatus)){
|
|
|
- if(DateUtil.minutesBetween(classEndDateCut10Minutes,date) >= 0){
|
|
|
+ if(DateUtil.minutesBetween(classEndDateTime,date) >= 0){
|
|
|
teacherAttendance.setSignOutStatus(YesOrNoEnum.YES);
|
|
|
List<CourseSchedule> courseSchedules = new ArrayList<>();
|
|
|
CourseSchedule cs = courseSchedule;
|
|
|
@@ -356,7 +356,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
|
|
|
}
|
|
|
}
|
|
|
//异常签退时间段，并且没有签退状态
|
|
|
- }else if(DateUtil.minutesBetween(classStartDateTime,date) >= 0 && DateUtil.minutesBetween(date,classEndDateCut10Minutes) > 0){
|
|
|
+ }else if(DateUtil.minutesBetween(classStartDateTime,date) >= 0 && DateUtil.minutesBetween(date,classEndDateTime) > 0){
|
|
|
teacherAttendance.setSignOutStatus(YesOrNoEnum.NO);
|
|
|
}else {
|
|
|
return;
|
zouxuan