From 22f3c92376854d678cf3dafcab2758ff0a62ae5c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期日, 01 三月 2026 02:34:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpClockInServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 fed04e9..effcfff 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
@@ -249,8 +249,8 @@
String endTime = "";
if(StringUtils.isNotEmpty(query.getStatisticDate())){
String statisticDate = query.getStatisticDate();
- startTime = statisticDate.split(" - ")[0];
- endTime = statisticDate.split(" - ")[1];
+ startTime = statisticDate.split(" - ")[0].split(" ")[0];
+ endTime = statisticDate.split(" - ")[1].split(" ")[0];
}
//查询数据
List<ClockInStatisticsDto> clockInStatistics = this.baseMapper.getClockInStatistics(pageInfo, appUserIds, startTime, endTime);
@@ -309,8 +309,8 @@
String endTime = "";
if(StringUtils.isNotEmpty(query.getStatisticDate())){
String statisticDate = query.getStatisticDate();
- startTime = statisticDate.split(" - ")[0];
- endTime = statisticDate.split(" - ")[1];
+ startTime = statisticDate.split(" - ")[0].split(" ")[0];
+ endTime = statisticDate.split(" - ")[1].split(" ")[0];
}
//查询数据
List<ClockInStatisticsDto> clockInStatistics = this.baseMapper.getClockInStatistics(pageInfo, appUserIds, startTime, endTime);
@@ -355,8 +355,8 @@
String endTime = "";
if(StringUtils.isNotEmpty(query.getStatisticDate())){
String statisticDate = query.getStatisticDate();
- startTime = statisticDate.split(" - ")[0];
- endTime = statisticDate.split(" - ")[1];
+ startTime = statisticDate.split(" - ")[0].split(" ")[0];
+ endTime = statisticDate.split(" - ")[1].split(" ")[0];
}
List<ClockInStatisticsDetailsDto> clockInStatisticsDetails = this.baseMapper.getClockInStatisticsDetails(pageInfo, query.getAppUserId(), startTime, endTime);
List<XpOperationsUserWithRoleVO> data = xpOperationUserClient.listByIdsWithRole(Arrays.asList(query.getAppUserId())).getData();
@@ -384,8 +384,8 @@
String endTime = "";
if(StringUtils.isNotEmpty(query.getStatisticDate())){
String statisticDate = query.getStatisticDate();
- startTime = statisticDate.split(" - ")[0];
- endTime = statisticDate.split(" - ")[1];
+ startTime = statisticDate.split(" - ")[0].split(" ")[0];
+ endTime = statisticDate.split(" - ")[1].split(" ")[0];
}
List<ClockInStatisticsDetailsDto> clockInStatisticsDetails = this.baseMapper.getClockInStatisticsDetails(pageInfo, query.getAppUserId(), startTime, endTime);
List<XpOperationsUserWithRoleVO> data = xpOperationUserClient.listByIdsWithRole(Arrays.asList(query.getAppUserId())).getData();
--
Gitblit v1.7.1