Merge remote-tracking branch 'origin/master'

liujie

2026-03-15 1fb894756c7e04b7b1d51d6dc74da19367fa02fd

 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("========== 进入下班过期的班次 ==========");