From aad10c063fbdebf817b902bbdc5122a693be228b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 18 四月 2026 14:15:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpClockInServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 95d472a..3f5645f 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
@@ -116,7 +116,7 @@
}
@Override
- public R<String> clockIn(ClockDTO dto) {
+ public R<Integer> clockIn(ClockDTO dto) {
XpCheckLocation xpCheckLocation = xpCheckLocationMapper.selectById(dto.getLocationId());
if (null == xpCheckLocation) {
@@ -160,11 +160,11 @@
}
this.save(xpClockIn);
sendAgreementUpdateNotification(now);
- return R.ok();
+ return R.ok(xpClockIn.getClockInResult());
}
@Override
- public R<String> clockOut(ClockDTO dto) {
+ public R<Integer> clockOut(ClockDTO dto) {
XpCheckLocation xpCheckLocation = xpCheckLocationMapper.selectById(dto.getLocationId());
if (null == xpCheckLocation) {
@@ -214,7 +214,7 @@
xpClockIn.setAppUserId(null);
this.updateById(xpClockIn);
sendAgreementUpdateNotification(now);
- return R.ok();
+ return R.ok(xpClockIn.getClockOutResult());
}
@Override
--
Gitblit v1.7.1