|
@@ -347,8 +347,8 @@ 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) {
|
|
|
|
|
|
350
|
+ Date checkOutTime = attendanceRecords.get(0).getCheckOutTime();
|
|
|
|
351
|
+ if (checkOutTime != null) {
|
|
352
|
return result;
|
352
|
return result;
|
|
353
|
}
|
353
|
}
|
|
354
|
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());
|