|
|
@@ -269,7 +269,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
|
|
|
Date classEndDateTime = DateUtil.stringToDate(classDate + " " + endClassTime, DateUtil.EXPANDED_DATE_TIME_FORMAT);
|
|
|
// Date classEndDateAdd60Minutes = DateUtil.addMinutes(classEndDateTime, 60);
|
|
|
// Date classEndDateCut10Minutes = DateUtil.addMinutes(classEndDateTime, -10);
|
|
|
-// Date add20Minutes = DateUtil.addMinutes(classStartDateTime, advanceSignMinutes * -1);
|
|
|
+ Date add1Minutes = DateUtil.addMinutes(classStartDateTime, -1);
|
|
|
// Date add60Minutes = DateUtil.addMinutes(classStartDateTime, -60);
|
|
|
//签到
|
|
|
String continueCourseTime = sysConfigDao.findConfigValue(SysConfigService.ONLINE_CONTINUE_COURSE_TIME);
|
|
|
@@ -287,10 +287,10 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
|
|
|
boolean isSign = false;
|
|
|
if(yesOrNoEnum == YesOrNoEnum.YES){
|
|
|
isSign = true;
|
|
|
- }else if(DateUtil.minutesBetween(date,classStartDateTime) > 0){
|
|
|
+ }else if(DateUtil.minutesBetween(date,add1Minutes) > 0){
|
|
|
//正常签到范围(开始之前)
|
|
|
isSign = true;
|
|
|
- }else if(DateUtil.minutesBetween(classStartDateTime,date) >= 0){
|
|
|
+ }else if(DateUtil.minutesBetween(add1Minutes,date) >= 0){
|
|
|
//异常签到范围(开始之后)
|
|
|
isSign = true;
|
|
|
teacherAttendance.setSignInStatus(YesOrNoEnum.NO);
|
|
|
@@ -356,7 +356,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
|
|
|
}
|
|
|
}
|
|
|
//异常签退时间段，并且没有签退状态
|
|
|
- }else if(DateUtil.minutesBetween(classStartDateTime,date) >= 0 && DateUtil.minutesBetween(date,classEndDateTime) > 0){
|
|
|
+ }else if(DateUtil.minutesBetween(add1Minutes,date) >= 0 && DateUtil.minutesBetween(date,classEndDateTime) > 0){
|
|
|
teacherAttendance.setSignOutStatus(YesOrNoEnum.NO);
|
|
|
}else {
|
|
|
return;
|
zouxuan