|
@@ -143,19 +143,19 @@ public class WorkAttendanceServiceImpl implements WorkAttendanceService {
|
|
if (alarmConfig.getClassifier().equals(1)) {
|
|
if (alarmConfig.getClassifier().equals(1)) {
|
|
//todo 上班考勤
|
|
//todo 上班考勤
|
|
|
|
|
|
|
|
+ //当天是否已经有该时段上班打卡记录,如果有则不记录
|
|
|
|
+ List<WorkAttendance> workAttendances = workAttendanceDAO.findByPeriod(personId,alarmConfig.getId(),recordTime.toDate());
|
|
|
|
+
|
|
|
|
+ if (workAttendances.size()>0){
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+
|
|
//准时上班
|
|
//准时上班
|
|
if (recordTime.compareTo(startTime)>0 && recordTime.compareTo(attendanceTime)<=0){
|
|
if (recordTime.compareTo(startTime)>0 && recordTime.compareTo(attendanceTime)<=0){
|
|
attendanceResult = WorkAttendance.SUCCESS;
|
|
attendanceResult = WorkAttendance.SUCCESS;
|
|
}
|
|
}
|
|
else if(recordTime.compareTo(attendanceTime)>0 && recordTime.compareTo(endTime)<=0){
|
|
else if(recordTime.compareTo(attendanceTime)>0 && recordTime.compareTo(endTime)<=0){
|
|
attendanceResult = WorkAttendance.LATE;
|
|
attendanceResult = WorkAttendance.LATE;
|
|
-
|
|
|
|
- //当天是否已经有该时段正常上班打卡记录,如果有则不记录
|
|
|
|
- List<WorkAttendance> workAttendances = workAttendanceDAO.findByPeriod(personId,alarmConfig.getId(),recordTime.toDate());
|
|
|
|
-
|
|
|
|
- if (workAttendances.size()>0){
|
|
|
|
- break;
|
|
|
|
- }
|
|
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
//todo 下班考勤
|
|
//todo 下班考勤
|