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/service/impl/XpShiftServiceImpl.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpShiftServiceImpl.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpShiftServiceImpl.java
index f9d91b0..cbe0800 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpShiftServiceImpl.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpShiftServiceImpl.java
@@ -1,6 +1,6 @@
package com.xiaopeng.maintenance.service.impl;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xiaopeng.api.model.account.XpOperationsUser;
import com.xiaopeng.api.model.maintenance.XpShift;
import com.xiaopeng.api.model.vehicleConvoy.XpVehicle;
@@ -13,6 +13,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
@@ -30,8 +31,19 @@
@Override
public PageInfo<XpShift> pageList(XpShiftQuery query) {
PageInfo<XpShift> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
- List<XpShift> list = this.baseMapper.pageList(query,pageInfo);
+ List<XpShift> list = this.baseMapper.pageList(query, pageInfo);
pageInfo.setRecords(list);
return pageInfo;
}
+
+
+ /**
+ * 查询班次列表
+ *
+ * @return
+ */
+ @Override
+ public List<XpShift> queryList() {
+ return this.list(new LambdaQueryWrapper<XpShift>().eq(XpShift::getDeleted, 0));
+ }
}
--
Gitblit v1.7.1