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/controller/XpClockInController.java | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpClockInController.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpClockInController.java
index 16b654c..e3fef59 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpClockInController.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpClockInController.java
@@ -50,7 +50,7 @@
@ApiOperation(value = "上班打卡", tags = "运维APP-排班与考勤")
@PostMapping("/maintenance-app/api/v1/clock/clockIn")
- public R<String> clockIn(@RequestBody ClockDTO dto) {
+ public R<Integer> clockIn(@RequestBody ClockDTO dto) {
Long id = tokenService.getLoginOperationUser().getId();
dto.setOperationsUserId(id);
return xpClockInService.clockIn(dto);
@@ -69,7 +69,7 @@
@ApiOperation(value = "下班打卡", tags = "运维APP-排班与考勤")
@PostMapping("/maintenance-app/api/v1/clock/clockOut")
- public R<String> clockOut(@RequestBody ClockDTO dto) {
+ public R<Integer> clockOut(@RequestBody ClockDTO dto) {
Long id = tokenService.getLoginOperationUser().getId();
dto.setOperationsUserId(id);
return xpClockInService.clockOut(dto);
@@ -103,16 +103,6 @@
@PostMapping("/api/v1/clock/exportClockInStatisticsDetails")
public void exportClockInStatisticsDetails(@RequestBody ClockInStatisticsDetailsVo query, HttpServletResponse response) {
xpClockInService.exportClockInStatisticsDetails(query, response);
- }
-
-
- @ApiOperation(value = "获取打卡详情", tags = "运维APP-排班与考勤")
- @PostMapping("/maintenance-app/api/v1/clock/getClockInfo")
- public R<XpClockIn> getClockInfo(){
- Long id = tokenService.getLoginOperationUser().getId();
- XpClockIn one = xpClockInService.getOne(new QueryWrapper<XpClockIn>().eq("app_user_id", id)
- .eq("is_deleted", 0).last(" and DATE(create_time) = DATE(NOW())"));
- return R.ok(one);
}
}
--
Gitblit v1.7.1