|
@@ -347,6 +347,10 @@ public class AttendanceRecordServiceImpl implements IAttendanceRecordService {
|
|
347
|
List<AttendanceRecord> tempList = attendanceRecords.stream().filter(record -> record.getAttendanceDate().equals(dto.getCheckInDate())).collect(Collectors.toList());
|
347
|
List<AttendanceRecord> tempList = attendanceRecords.stream().filter(record -> record.getAttendanceDate().equals(dto.getCheckInDate())).collect(Collectors.toList());
|
|
348
|
if (CollectionUtil.isEmpty(tempList)) {
|
348
|
if (CollectionUtil.isEmpty(tempList)) {
|
|
349
|
Date attendanceDate = attendanceRecords.get(0).getAttendanceDate();
|
349
|
Date attendanceDate = attendanceRecords.get(0).getAttendanceDate();
|
|
|
|
350
|
+ Date attendanceDateEnd = attendanceRecords.get(0).getAttendanceDateEnd();
|
|
|
|
351
|
+ if (attendanceDateEnd != null) {
|
|
|
|
352
|
+ return result;
|
|
|
|
353
|
+ }
|
|
350
|
attendanceRecords = attendanceRecords.stream().filter(record -> record.getAttendanceDate().equals(attendanceDate)).collect(Collectors.toList());
|
354
|
attendanceRecords = attendanceRecords.stream().filter(record -> record.getAttendanceDate().equals(attendanceDate)).collect(Collectors.toList());
|
|
351
|
} else {
|
355
|
} else {
|
|
352
|
attendanceRecords = tempList;
|
356
|
attendanceRecords = tempList;
|