|
|
@@ -151,21 +151,11 @@ public class Out_In_RecordUtil {
|
|
|
.withMinute(ruleDetails.getPmEndTime().getMinute())
|
|
|
.withSecond(ruleDetails.getPmEndTime().getSecond());
|
|
|
}
|
|
|
- if(ruleDetails.getEveningStatus() != null && ruleDetails.getEveningStatus() == 1){
|
|
|
- eveningStartTime = recordTime.withHour(ruleDetails.getEveningStartTime().getHour())
|
|
|
- .withMinute(ruleDetails.getEveningStartTime().getMinute())
|
|
|
- .withSecond(ruleDetails.getEveningStartTime().getSecond());
|
|
|
- eveningEndTime = recordTime.withHour(ruleDetails.getEveningEndTime().getHour())
|
|
|
- .withMinute(ruleDetails.getEveningEndTime().getMinute())
|
|
|
- .withSecond(ruleDetails.getEveningEndTime().getSecond());
|
|
|
- }
|
|
|
if(status == 1){//出
|
|
|
if(recordTime.isBefore(amEndTime) && recordTime.isAfter(amStartTime)){
|
|
|
attendanceStatus = "早退";
|
|
|
}else if(recordTime.isBefore(pmEndTime) && recordTime.isAfter(pmStartTime)){
|
|
|
attendanceStatus = "早退";
|
|
|
- }else if(recordTime.isBefore(eveningEndTime) && recordTime.isAfter(eveningStartTime)){
|
|
|
- attendanceStatus = "早退";
|
|
|
}else{
|
|
|
attendanceStatus = "离校";
|
|
|
}
|
|
|
@@ -174,8 +164,6 @@ public class Out_In_RecordUtil {
|
|
|
attendanceStatus = "迟到";
|
|
|
}else if(recordTime.isBefore(pmEndTime) && recordTime.isAfter(pmStartTime)){
|
|
|
attendanceStatus = "迟到";
|
|
|
- }else if(recordTime.isBefore(eveningEndTime) && recordTime.isAfter(eveningStartTime)){
|
|
|
- attendanceStatus = "迟到";
|
|
|
}else{
|
|
|
attendanceStatus = "到校";
|
|
|
}
|