diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceCheckServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceCheckServiceImpl.java index 9bd57956..2f090a30 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceCheckServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsAttendanceCheckServiceImpl.java @@ -149,8 +149,8 @@ public class WmsAttendanceCheckServiceImpl implements IWmsAttendanceCheckService private boolean isBackwardCrossDay(WmsAttendanceScheduleVo schedule) { if (!isCrossDayShift(schedule)) return false; - if (schedule.getShiftStartTime() == null || schedule.getShiftEndTime() == null) return false; - return toLocalTime(schedule.getShiftStartTime()).getHour() >= 16; + if (schedule.getShiftEndTime() == null) return false; + return toLocalTime(schedule.getShiftEndTime()).getHour() >= 12; } private WmsAttendanceRule getActiveRule() { @@ -309,7 +309,7 @@ public class WmsAttendanceCheckServiceImpl implements IWmsAttendanceCheckService LocalDateTime windowStart; LocalDateTime windowEnd; - boolean backward = st != null && et != null && st.getHour() >= 16 && crossDay; + boolean backward = crossDay && et != null && et.getHour() >= 12; if (crossDay && backward) { windowStart = LocalDateTime.of(ld, et).minusHours(2);