From e04f8ea7976bf06c6d9deafb16e62a271f9abeb7 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 20 四月 2026 20:12:51 +0800
Subject: [PATCH] [fix] 巡游打卡管理--统计数据
---
xp-robotaxi-maintenance-boot/src/main/resources/mapper/maintenance/XpCruiseCheckInRecordMapper.xml | 10 ++++++++++
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpCruiseCheckInRuleController.java | 1 -
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpCruiseCheckInRuleController.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpCruiseCheckInRuleController.java
index fa1d8a8..e6e305c 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpCruiseCheckInRuleController.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpCruiseCheckInRuleController.java
@@ -15,7 +15,6 @@
import com.xiaopeng.maintenance.vo.XpCruiseCheckInRecordQuery;
import com.xiaopeng.maintenance.vo.XpCruiseCheckInRecordVO;
import com.xiaopeng.maintenance.vo.XpCruiseCheckInStatisticsQuery;
-import com.xiaopeng.maintenance.vo.XpCruiseCheckInStatisticsVO;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
diff --git a/xp-robotaxi-maintenance-boot/src/main/resources/mapper/maintenance/XpCruiseCheckInRecordMapper.xml b/xp-robotaxi-maintenance-boot/src/main/resources/mapper/maintenance/XpCruiseCheckInRecordMapper.xml
index 8384b95..ab22fc7 100644
--- a/xp-robotaxi-maintenance-boot/src/main/resources/mapper/maintenance/XpCruiseCheckInRecordMapper.xml
+++ b/xp-robotaxi-maintenance-boot/src/main/resources/mapper/maintenance/XpCruiseCheckInRecordMapper.xml
@@ -107,8 +107,18 @@
COUNT(CASE WHEN r.field_situation = 1 THEN 1 END) AS noTraffic,
COUNT(CASE WHEN r.field_situation = 2 THEN 1 END) AS traffic
FROM xp_cruise_check_in_record r
+ LEFT JOIN xp_cruise_check_in_rule cr ON r.cruise_check_in_rule_id = cr.id AND cr.del_flag = '0'
+ LEFT JOIN xp_operations_user u ON r.operations_user_id = u.id AND u.del_flag = '0'
+ LEFT JOIN xp_fleet_operations fo ON u.id = fo.operationsUserId
+ LEFT JOIN xp_fleet f ON fo.fleetId = f.id
WHERE r.del_flag = '0'
AND r.check_in_time IS NOT NULL
+ <if test="query.ruleName != null and query.ruleName != ''">
+ AND cr.name LIKE CONCAT('%', #{query.ruleName}, '%')
+ </if>
+ <if test="query.fleet != null and query.fleet != ''">
+ AND f.fleet_name LIKE CONCAT('%', #{query.fleet}, '%')
+ </if>
<if test="query.startDate != null">
AND DATE(r.check_in_time) >= #{query.startDate}
</if>
--
Gitblit v1.7.1