|
|
@@ -365,8 +365,8 @@ public class OutInRecordUtil {
|
|
|
if (amEndTime != null && amStartTime != null && recordTime.isBefore(amEndTime) && recordTime.isAfter(amStartTime)) {
|
|
|
attendanceStatus = "迟到";
|
|
|
LocalDateTime localDateTime = amStartTime;
|
|
|
- if (ruleDetails.getOverMinutes() != null) {
|
|
|
- localDateTime = amStartTime.plusMinutes(ruleDetails.getOverMinutes());
|
|
|
+ if (ruleDetails.getAmLateMinutes() != null) {
|
|
|
+ localDateTime = amStartTime.plusMinutes(ruleDetails.getAmLateMinutes());
|
|
|
}
|
|
|
if (recordTime.isAfter(localDateTime)) {
|
|
|
attendanceStatus = "旷课";
|
|
|
@@ -374,8 +374,8 @@ public class OutInRecordUtil {
|
|
|
} else if (pmEndTime != null && pmStartTime != null && recordTime.isBefore(pmEndTime) && recordTime.isAfter(pmStartTime)) {
|
|
|
attendanceStatus = "迟到";
|
|
|
LocalDateTime localDateTime = pmStartTime;
|
|
|
- if (ruleDetails.getOverMinutes() != null) {
|
|
|
- localDateTime = pmStartTime.plusMinutes(ruleDetails.getOverMinutes());
|
|
|
+ if (ruleDetails.getPmLateMinutes() != null) {
|
|
|
+ localDateTime = pmStartTime.plusMinutes(ruleDetails.getPmLateMinutes());
|
|
|
}
|
|
|
if (recordTime.isAfter(localDateTime)) {
|
|
|
attendanceStatus = "旷课";
|
|
|
@@ -383,8 +383,8 @@ public class OutInRecordUtil {
|
|
|
} else if (eveningEndTime != null && eveningStartTime != null && recordTime.isBefore(eveningEndTime) && recordTime.isAfter(eveningStartTime)) {
|
|
|
attendanceStatus = "迟到";
|
|
|
LocalDateTime localDateTime = eveningStartTime;
|
|
|
- if (ruleDetails.getOverMinutes() != null) {
|
|
|
- localDateTime = eveningStartTime.plusMinutes(ruleDetails.getOverMinutes());
|
|
|
+ if (ruleDetails.getEveningLateMinutes() != null) {
|
|
|
+ localDateTime = eveningStartTime.plusMinutes(ruleDetails.getEveningLateMinutes());
|
|
|
}
|
|
|
if (recordTime.isAfter(localDateTime)) {
|
|
|
attendanceStatus = "旷课";
|