From bb60f152e4c4cf4abd81df31aa77c927cdd9e19a Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 09 四月 2026 15:52:11 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/schedule/ClockInScheduleTask.java | 5 +++--
1 files changed, 3 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 94934ff..72a8529 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
@@ -92,7 +92,7 @@
.map(XpFleetOperations::getOperationsUserId).distinct().collect(Collectors.toList());
// 批量查询人员打卡信息
List<XpClockIn> clockInList = xpClockInService.list(Wrappers.lambdaQuery(XpClockIn.class)
- .in(XpClockIn::getAppUserId, operationsUserIds));
+ .in(XpClockIn::getAppUserId, operationsUserIds).in(XpClockIn::getShiftId, ids));
// 判断有哪些人员没有打卡信息
List<Long> noClockInUserIds = operationsUserIds.stream().filter(id -> clockInList.stream().noneMatch(clockIn -> clockIn.getAppUserId().equals(id))).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(noClockInUserIds)){
@@ -147,7 +147,7 @@
.map(XpFleetOperations::getOperationsUserId).distinct().collect(Collectors.toList());
// 批量查询人员打卡信息
List<XpClockIn> clockInListFive = xpClockInService.list(Wrappers.lambdaQuery(XpClockIn.class)
- .in(XpClockIn::getAppUserId, operationsUserIdsFive)
+ .in(XpClockIn::getAppUserId, operationsUserIdsFive).in(XpClockIn::getShiftId, fiveIds)
.isNull(XpClockIn::getClockOutTime));
log.info("========== 获取到{}个人员没有下班打卡信息 ==========", clockInListFive.size());
if(!CollectionUtils.isEmpty(clockInListFive)){
@@ -192,6 +192,7 @@
// 批量查询人员打卡信息
List<XpClockIn> clockInListFive = xpClockInService.list(Wrappers.lambdaQuery(XpClockIn.class)
.in(XpClockIn::getAppUserId, operationsUserIdsFive)
+ .in(XpClockIn::getShiftId, fiveIds)
.likeRight(XpClockIn::getClockInTime,LocalDate.now().minusDays(1))
.isNull(XpClockIn::getClockOutTime));
log.info("========== 获取到{}个人员没有下班打卡信息 ==========", clockInListFive.size());
--
Gitblit v1.7.1