From c96fbe6b0aeb413a17c429133ee6d81d138144b9 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 09 六月 2026 10:58:52 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpCruiseCheckInRuleServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 cc701b9..6f18e7d 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
@@ -72,7 +72,7 @@
@Override
public AppXpCruiseCheckInRuleVo getMyXpCruiseCheckInRule(Long uid) {
List<XpCruiseCheckInRule> list = this.list(new LambdaQueryWrapper<XpCruiseCheckInRule>().eq(XpCruiseCheckInRule::getDeleted, 0)
- .apply("find_in_set({0}, operations_user_id)", uid).last(" and (now() BETWEEN start_time and end_time or cyclic_mode = 1)"));
+ .eq(XpCruiseCheckInRule::getOperationsUserId, uid).last(" and (now() BETWEEN start_time and end_time or cyclic_mode = 1)"));
if(list.isEmpty()){
return null;
}
@@ -147,7 +147,7 @@
public Long saveCruiseCheckInRecord(XpCruiseCheckInRecord dto) {
Long checkLocationId = dto.getCheckLocationId();
List<XpCruiseCheckInRule> list = this.list(new LambdaQueryWrapper<XpCruiseCheckInRule>().eq(XpCruiseCheckInRule::getDeleted, 0)
- .apply("find_in_set({0}, operations_user_id)", dto.getOperationsUserId()).last(" and (now() BETWEEN start_time and end_time or cyclic_mode = 1)"));
+ .eq(XpCruiseCheckInRule::getOperationsUserId, dto.getOperationsUserId()).last(" and (now() BETWEEN start_time and end_time or cyclic_mode = 1)"));
if(list.isEmpty()){
return null;
}
@@ -294,10 +294,10 @@
long count = xpCruiseCheckInRuleLocationService.count(new LambdaQueryWrapper<XpCruiseCheckInRuleLocation>()
.eq(XpCruiseCheckInRuleLocation::getCruiseCheckInRuleId, cruiseCheckInRuleListPage.getId()));
cruiseCheckInRuleListPage.setPointNum(count);
- List<XpOperationsUser> xpOperationsUser = xpOperationsUserClient.queryByIds(cruiseCheckInRuleListPage.getOperationsUserId()).getData();
- cruiseCheckInRuleListPage.setUserName(xpOperationsUser.stream().map(XpOperationsUser::getNickName).collect(Collectors.toList()));
- cruiseCheckInRuleListPage.setPhone(xpOperationsUser.stream().map(XpOperationsUser::getPhoneNumber).collect(Collectors.toList()));
- cruiseCheckInRuleListPage.setRoleName(xpOperationsUser.stream().map(XpOperationsUser::getRoleName).collect(Collectors.toList()));
+ XpOperationsUser xpOperationsUser = xpOperationsUserClient.queryById(cruiseCheckInRuleListPage.getOperationsUserId()).getData();
+ cruiseCheckInRuleListPage.setUserName(xpOperationsUser.getNickName());
+ cruiseCheckInRuleListPage.setPhone(xpOperationsUser.getPhoneNumber());
+ cruiseCheckInRuleListPage.setRoleName(xpOperationsUser.getRoleName());
}
return xpCruiseCheckInRuleListPage;
}
--
Gitblit v1.7.1