From 1fb894756c7e04b7b1d51d6dc74da19367fa02fd Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期日, 15 三月 2026 23:29:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/schedule/ClockInScheduleTask.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/schedule/ClockInScheduleTask.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/schedule/ClockInScheduleTask.java
index 1527795..94934ff 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/schedule/ClockInScheduleTask.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/schedule/ClockInScheduleTask.java
@@ -129,7 +129,8 @@
// 处理下班卡缺卡情况
// 过滤当前时间在班次下班打卡时间之后5小时的数据 今日已过下班打卡时间5小时后的班次
List<XpShift> shiftListFive = xpShifts.stream().filter(xpShift ->
- DateUtils.stringToLocalDateTime(LocalDate.now() + " " + xpShift.getEndTime() + ":00").plusHours(5).isBefore(LocalDateTime.now())).collect(Collectors.toList());
+ DateUtils.stringToLocalDateTime(LocalDate.now() + " " + xpShift.getEndTime() + ":00").plusMinutes(1).isBefore(LocalDateTime.now())).collect(Collectors.toList());
+// DateUtils.stringToLocalDateTime(LocalDate.now() + " " + xpShift.getEndTime() + ":00").plusHours(5).isBefore(LocalDateTime.now())).collect(Collectors.toList());
List<Long> fiveIds = shiftListFive.stream().map(XpShift::getId).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(fiveIds)){
log.info("========== 进入下班过期的班次 ==========");
@@ -176,7 +177,8 @@
// 处理下班卡缺卡情况
// 过滤当前时间在班次下班打卡时间之后5小时的数据 今日已过下班打卡时间5小时后的班次
List<XpShift> shiftListFive = xpShifts.stream().filter(xpShift ->
- DateUtils.stringToLocalDateTime(LocalDate.now().minusDays(1) + " " + xpShift.getEndTime() + ":00").plusHours(5).isBefore(LocalDateTime.now())).collect(Collectors.toList());
+ DateUtils.stringToLocalDateTime(LocalDate.now().minusDays(1) + " " + xpShift.getEndTime() + ":00").plusMinutes(1).isBefore(LocalDateTime.now())).collect(Collectors.toList());
+// DateUtils.stringToLocalDateTime(LocalDate.now().minusDays(1) + " " + xpShift.getEndTime() + ":00").plusHours(5).isBefore(LocalDateTime.now())).collect(Collectors.toList());
List<Long> fiveIds = shiftListFive.stream().map(XpShift::getId).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(fiveIds)){
log.info("========== 进入下班过期的班次 ==========");
--
Gitblit v1.7.1