From ac30fe67a235e0e269cf12f6fcc9f8583d4baa1f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 18 四月 2026 17:35:09 +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/XpCruiseCheckInRuleServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpCruiseCheckInRuleServiceImpl.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpCruiseCheckInRuleServiceImpl.java
index 2f90dbf..91a7c34 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpCruiseCheckInRuleServiceImpl.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpCruiseCheckInRuleServiceImpl.java
@@ -92,7 +92,7 @@
.eq(XpCruiseCheckInRecord::getDeleted, 0)
.eq(XpCruiseCheckInRecord::getCruiseCheckInRuleId, ruleId)
.eq(XpCruiseCheckInRecord::getOperationsUserId, uid)
- .last(" and DATE_FORMAT(check_in_time, '%Y-%m-%d') = DATE_FORMAT(NOW(), '%Y-%m-%d"));
+ .last(" and DATE(check_in_time) = DATE(NOW())"));
//构建返回结果
for (XpCruiseCheckInRuleLocation xpCruiseCheckInRuleLocation : list) {
XpCruiseCheckInRecord xpCruiseCheckInRecord = list1.stream().filter(x -> x.getCheckLocationId().equals(xpCruiseCheckInRuleLocation.getCheckLocationId())).findFirst().orElse(null);
@@ -132,7 +132,7 @@
.eq(XpCruiseCheckInRecord::getDeleted, 0)
.eq(XpCruiseCheckInRecord::getCheckLocationId, checkLocationId)
.eq(XpCruiseCheckInRecord::getOperationsUserId, dto.getOperationsUserId())
- .last(" and DATE_FORMAT(check_in_time, '%Y-%m-%d') = DATE_FORMAT(NOW(), '%Y-%m-%d')"));
+ .last(" and DATE(check_in_time) = DATE(NOW())"));
if(null != cruiseCheckInRecord){
throw new ServiceException("不能重复打卡", I18nKeyConstant.CANNOT_REPEAT_CLOCKING_IN);
}
@@ -169,7 +169,7 @@
.eq(XpCruiseCheckInRecord::getCruiseCheckInRuleId, dto.getId())
.eq(XpCruiseCheckInRecord::getDeleted, 0)
.eq(XpCruiseCheckInRecord::getOperationsUserId, uid)
- .last(" and DATE_FORMAT(check_in_time, '%Y-%m-%d') = DATE_FORMAT(NOW(), '%Y-%m-%d') order by check_in_time desc limit 1"));
+ .last(" and DATE(check_in_time) = DATE(NOW()) order by check_in_time desc limit 1"));
XpCruiseCheckInRuleLocation cruiseCheckInRuleLocation = null;
//没有打卡的情况，用第一个打卡点位
if(null == cruiseCheckInRecord){
@@ -232,6 +232,6 @@
.eq(XpCruiseCheckInRecord::getCheckLocationId, locationId)
.eq(XpCruiseCheckInRecord::getDeleted, 0)
.eq(XpCruiseCheckInRecord::getOperationsUserId, uid)
- .last(" and DATE_FORMAT(check_in_time, '%Y-%m-%d') = DATE_FORMAT(NOW(), '%Y-%m-%d')"));
+ .last(" and DATE(check_in_time) = DATE(NOW())"));
}
}
--
Gitblit v1.7.1