From 80f6c17c34dae2c5f9f861e274f4e8d5e2394d5c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 25 二月 2026 18:00:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpClockInServiceImpl.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpClockInServiceImpl.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpClockInServiceImpl.java
index f0f37b9..d84b7b6 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpClockInServiceImpl.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpClockInServiceImpl.java
@@ -99,6 +99,7 @@
xpClockIn.setClockInLon(dto.getUserLon());
xpClockIn.setClockInLat(dto.getUserLat());
xpClockIn.setShiftId(dto.getShiftId());
+ xpClockIn.setClockInAddress(dto.getClockInAddress());
if (xpClockIn.getClockInTime().isAfter(startLocalDateTime)) {
xpClockIn.setClockInResult(2);
}else {
@@ -143,7 +144,7 @@
xpClockIn.setClockOutTime(LocalDateTime.now());
xpClockIn.setClockOutLon(dto.getUserLon());
xpClockIn.setClockOutLat(dto.getUserLat());
-
+ xpClockIn.setClockOutAddress(dto.getClockOutAddress());
if (xpClockIn.getClockOutTime().isBefore(endLocalDateTime)) {
xpClockIn.setClockInResult(2);
}else {
@@ -164,12 +165,9 @@
LocalDateTime startTime = LocalDateTime.of(LocalDate.now(), LocalTime.MIN); // 00:00:00
LocalDateTime endTime = LocalDateTime.of(LocalDate.now(), LocalTime.MAX); // 23:59:59
- // 2. 计算分表后缀 (userId % 10)
- Integer tableSuffix = (int) (appUserId % 10);
-
// 3. 查询当天打卡记录
List<XpClockIn> records = baseMapper.selectTodayClockInRecords(
- tableSuffix, appUserId, startTime, endTime
+ appUserId, startTime, endTime
);
// 4. 判断上班状态
--
Gitblit v1.7.1