From 08ef63eb44102f05c21e5370fd096a7f0cfee20c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 27 二月 2026 10:05:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpClockInController.java | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 insertions(+), 6 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 b7d6cb7..f710f30 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
@@ -1,17 +1,16 @@
package com.xiaopeng.maintenance.controller;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.xiaopeng.api.model.maintenance.XpClockIn;
-import com.xiaopeng.api.model.maintenance.XpErrorType;
import com.xiaopeng.common.core.domain.R;
+import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.common.security.service.TokenService;
import com.xiaopeng.maintenance.dto.ClockDTO;
-import com.xiaopeng.maintenance.dto.ShiftAttendanceDTO;
+import com.xiaopeng.maintenance.dto.ClockInStatisticsDto;
import com.xiaopeng.maintenance.dto.VerifyRangeDTO;
import com.xiaopeng.maintenance.service.IXpClockInService;
-import com.xiaopeng.maintenance.vo.ShiftAttendanceVO;
-import io.swagger.annotations.Api;
+import com.xiaopeng.maintenance.dto.ClockInStatisticsDetailsDto;
+import com.xiaopeng.maintenance.vo.ClockInStatisticsDetailsVo;
+import com.xiaopeng.maintenance.vo.ClockInStatisticsVo;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +19,8 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
/**
* <p>
@@ -74,5 +75,38 @@
return xpClockInService.clockOut(dto);
}
+
+ @ApiOperation(value = "排班考勤打卡统计列表", tags = {"管理后台-运维执行"})
+ @PostMapping("/api/v1/clock/getClockInStatistics")
+ public R<PageInfo<ClockInStatisticsDto>> getClockInStatistics(@RequestBody ClockInStatisticsVo vo){
+ PageInfo<ClockInStatisticsDto> clockInStatistics = xpClockInService.getClockInStatistics(vo);
+ return R.ok(clockInStatistics);
+ }
+
+
+ @ApiOperation(value = "排班考勤打卡统计导出", tags = {"管理后台-运维执行"})
+ @PostMapping("/api/v1/clock/exportClockInStatistics")
+ public void exportClockInStatistics(@RequestBody ClockInStatisticsVo vo, HttpServletResponse response){
+ xpClockInService.exportClockInStatistics(vo, response);
+ }
+
+
+
+
+ @ApiOperation(value = "排班考勤打卡统计详情列表", tags = {"管理后台-运维执行"})
+ @PostMapping("/api/v1/clock/getClockInStatisticsDetails")
+ public R<PageInfo<ClockInStatisticsDetailsDto>> getClockInStatisticsDetails(@RequestBody ClockInStatisticsDetailsVo query){
+ PageInfo<ClockInStatisticsDetailsDto> clockInStatisticsDetails = xpClockInService.getClockInStatisticsDetails(query);
+ return R.ok(clockInStatisticsDetails);
+ }
+
+
+ @ApiOperation(value = "排班考勤打卡统计详情导出", tags = {"管理后台-运维执行"})
+ @PostMapping("/api/v1/clock/exportClockInStatisticsDetails")
+ public void exportClockInStatisticsDetails(@RequestBody ClockInStatisticsDetailsVo query, HttpServletResponse response){
+ xpClockInService.exportClockInStatisticsDetails(query, response);
+ }
+
+
}
--
Gitblit v1.7.1