From 3d62ebf952085c70826e29da7e00569f29b80b9c Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Thu, 14 May 2026 18:12:45 +0800 Subject: [PATCH] =?UTF-8?q?fix(workflow):=20=E4=BF=AE=E5=A4=8D=E8=B7=A8?= =?UTF-8?q?=E5=A4=A9=E7=8F=AD=E6=AC=A1=E8=80=83=E5=8B=A4=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改 isBackwardCrossDay 方法中判断条件,使用 ShiftEndTime 替代 ShiftStartTime 进行小时比较 - 更新 backward 标志位计算逻辑,统一使用 et 变量进行小时数判断 - 修正跨天班次的判断阈值从 16 点调整为 12 点 --- .../com/klp/service/impl/WmsAttendanceCheckServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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);