소스 검색

勤务模块

chenshudong 4 달 전
부모
커밋
c9b1762885
1개의 변경된 파일13개의 추가작업 그리고 3개의 파일을 삭제
  1. 13 3
      airport-attendance/src/main/java/com/sundot/airport/attendance/service/impl/AttendancePostRecordServiceImpl.java

+ 13 - 3
airport-attendance/src/main/java/com/sundot/airport/attendance/service/impl/AttendancePostRecordServiceImpl.java

@@ -50,7 +50,18 @@ public class AttendancePostRecordServiceImpl implements IAttendancePostRecordSer
50
         if (CollectionUtil.isEmpty(records)) {
50
         if (CollectionUtil.isEmpty(records)) {
51
             return new ArrayList<>();
51
             return new ArrayList<>();
52
         }
52
         }
53
-        records = records.stream().map(record -> {
53
+//        records = records.stream().map(record -> {
54
+//            //下通道时间是2001年1月1日00:00:00,所以这里要设置为null
55
+//            if (record.getCheckOutTime() != null && record.getCheckOutTime().getTime() == 978352000000L) {
56
+//                record.setCheckOutTime(null);
57
+//            }
58
+//            if (record.getWorkDuration() != null && record.getWorkDuration() < 0) {
59
+//                record.setWorkDuration(0L);
60
+//            }
61
+//            return record;
62
+//        }).collect(Collectors.toList());
63
+
64
+        records.forEach(record -> {
54
             //下通道时间是2001年1月1日00:00:00,所以这里要设置为null
65
             //下通道时间是2001年1月1日00:00:00,所以这里要设置为null
55
             if (record.getCheckOutTime() != null && record.getCheckOutTime().getTime() == 978352000000L) {
66
             if (record.getCheckOutTime() != null && record.getCheckOutTime().getTime() == 978352000000L) {
56
                 record.setCheckOutTime(null);
67
                 record.setCheckOutTime(null);
@@ -58,8 +69,7 @@ public class AttendancePostRecordServiceImpl implements IAttendancePostRecordSer
58
             if (record.getWorkDuration() != null && record.getWorkDuration() < 0) {
69
             if (record.getWorkDuration() != null && record.getWorkDuration() < 0) {
59
                 record.setWorkDuration(0L);
70
                 record.setWorkDuration(0L);
60
             }
71
             }
61
-            return record;
62
-        }).collect(Collectors.toList());
72
+        });
63
         return records;
73
         return records;
64
     }
74
     }
65
 
75