|
|
@@ -658,8 +658,13 @@ public class DkRecordServiceImpl implements DkRecordService { |
|
|
|
dayRecord.setRbHalf(rbHalf); |
|
|
|
|
|
|
|
// 迟到判断 |
|
|
|
if(dk.getClockIn() != null && dk.getClockOut() != null){ |
|
|
|
if(dk.getClockIn().isAfter(workStartTime1.plusMinutes(1))){ |
|
|
|
if(dk.getClockIn() != null){ |
|
|
|
if(dk.getClockIn().isAfter(workStartTime1.plusMinutes(1))&& |
|
|
|
(dk.getClockIn().getDayOfWeek()==DayOfWeek.MONDAY|| |
|
|
|
dk.getClockIn().getDayOfWeek() == DayOfWeek.TUESDAY|| |
|
|
|
dk.getClockIn().getDayOfWeek() == DayOfWeek.WEDNESDAY|| |
|
|
|
dk.getClockIn().getDayOfWeek() == DayOfWeek.THURSDAY|| |
|
|
|
dk.getClockIn().getDayOfWeek() == DayOfWeek.FRIDAY)){ |
|
|
|
dayRecord.setChidao("●"); |
|
|
|
dayRecord.setRemark("迟到1次"); |
|
|
|
lateCount ++; |