勤务模块

airport-attendance/src/main/java/com/sundot/airport/attendance/service/impl/AttendanceRecordServiceImpl.java

@@ -318,21 +318,46 @@ public class AttendanceRecordServiceImpl implements IAttendanceRecordService {
     @Override
     public List<AttendanceRecordRep> recordList(AttendanceRecordReq dto) {
         List<AttendanceRecordRep> result = Lists.newArrayList();
-        AttendanceRecord recordSearch = new AttendanceRecord();
-        recordSearch.setUserId(dto.getUserId());
+//        AttendanceRecord recordSearch = new AttendanceRecord();
+//        recordSearch.setUserId(dto.getUserId());
+//        if (StrUtil.equals("1", dto.getType())) {
+//            // 单日查询场景
+//            Date targetAttendanceDate = dto.getCheckInDate();
+//            // 计算查询时间范围
+//            Date yesterday = DateUtils.addDays(targetAttendanceDate, -1);
+//            // 设置查询条件
+//            recordSearch.setAttendanceDateStart(yesterday);
+//            recordSearch.setAttendanceDateEnd(targetAttendanceDate);
+//        } else {
+//            recordSearch.setAttendanceDateStart(dto.getStartDate());
+//            recordSearch.setAttendanceDateEnd(dto.getEndDate());
+//        }
+//        List<AttendanceRecord> attendanceRecords = attendanceRecordMapper.selectAttendanceRecordList(recordSearch);
+//        if (CollectionUtil.isEmpty(attendanceRecords)) {
+//            return result;
+//        }
+        List<AttendanceRecord> attendanceRecords;
         if (StrUtil.equals("1", dto.getType())) {
-            // 单日查询场景
-            Date targetAttendanceDate = dto.getCheckInDate();
-            // 计算查询时间范围
-            Date yesterday = DateUtils.addDays(targetAttendanceDate, -1);
-            // 设置查询条件
-            recordSearch.setAttendanceDateStart(targetAttendanceDate);
-            recordSearch.setAttendanceDateEnd(targetAttendanceDate);
+            AttendanceRecord recordSearch = new AttendanceRecord();
+            recordSearch.setUserId(dto.getUserId());
+            attendanceRecords = attendanceRecordMapper.selectAttendanceRecordList(recordSearch);
+            if (CollectionUtil.isEmpty(attendanceRecords)) {
+                return result;
+            }
+            List<AttendanceRecord> tempList = attendanceRecords.stream().filter(record -> record.getAttendanceDate().equals(dto.getCheckInDate())).collect(Collectors.toList());
+            if (CollectionUtil.isEmpty(tempList)) {
+                Date attendanceDate = attendanceRecords.get(0).getAttendanceDate();
+                attendanceRecords = attendanceRecords.stream().filter(record -> record.getAttendanceDate().equals(attendanceDate)).collect(Collectors.toList());
+            } else {
+                attendanceRecords = tempList;
+            }
         } else {
+            AttendanceRecord recordSearch = new AttendanceRecord();
+            recordSearch.setUserId(dto.getUserId());
             recordSearch.setAttendanceDateStart(dto.getStartDate());
             recordSearch.setAttendanceDateEnd(dto.getEndDate());
+            attendanceRecords = attendanceRecordMapper.selectAttendanceRecordList(recordSearch);
         }
-        List<AttendanceRecord> attendanceRecords = attendanceRecordMapper.selectAttendanceRecordList(recordSearch);
         if (CollectionUtil.isEmpty(attendanceRecords)) {
             return result;
         }