From 2f9486da70ea4c642157c4f9c6981a3e5320431a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 23 三月 2026 19:18:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpVehicleRepairServiceImpl.java | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpVehicleRepairServiceImpl.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpVehicleRepairServiceImpl.java
index 13448c4..945ef9e 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpVehicleRepairServiceImpl.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpVehicleRepairServiceImpl.java
@@ -19,6 +19,7 @@
import com.xiaopeng.maintenance.dto.XpVehicleRepairStartDTO;
import com.xiaopeng.maintenance.mapper.XpVehicleRepairMapper;
import com.xiaopeng.maintenance.model.query.XpVehicleRepairPageQuery;
+import com.xiaopeng.maintenance.model.vo.XpVehicleRepairMgtVO;
import com.xiaopeng.maintenance.model.vo.XpVehicleRepairVO;
import com.xiaopeng.maintenance.service.IXpVehicleRepairService;
import com.xiaopeng.maintenance.vo.ChargingStatusVO;
@@ -81,7 +82,7 @@
}
@Override
- public PageInfo<XpVehicleRepairVO> queryDetectionByVehicleId(XpVehicleRepairPageQuery query) {
+ public PageInfo<XpVehicleRepairMgtVO> queryDetectionByVehicleId(XpVehicleRepairPageQuery query) {
// 1. 如果有操作人姓名过滤条件,先查询符合条件的用户ID列表
List<Long> userIds = null;
if (StringUtils.isNotBlank(query.getSendUserName())) {
@@ -131,7 +132,7 @@
Page<XpVehicleRepair> resultPage = this.page(page, wrapper);
// 4. 转换为 VO 并填充操作人姓名
- List<XpVehicleRepairVO> records = new ArrayList<>();
+ List<XpVehicleRepairMgtVO> records = new ArrayList<>();
if (!CollectionUtils.isEmpty(resultPage.getRecords())) {
// 提取所有操作人ID
List<Long> allUserIds = resultPage.getRecords().stream()
@@ -155,7 +156,7 @@
// 转换并填充数据
for (XpVehicleRepair chargingRecord : resultPage.getRecords()) {
- XpVehicleRepairVO vo = new XpVehicleRepairVO();
+ XpVehicleRepairMgtVO vo = new XpVehicleRepairMgtVO();
BeanUtils.copyProperties(chargingRecord, vo);
vo.setOperationTime(chargingRecord.getCreateTime());
@@ -168,9 +169,6 @@
String userName = userNameMap.get(chargingRecord.getReturnUserId());
vo.setOperatorEndName(userName);
}
-
-
-
String RepairMoneyDetail = vo.getRepairMoneyDetail();
if (StringUtils.isNotBlank(RepairMoneyDetail)) {
@@ -213,16 +211,12 @@
}
vo.setStartRepairPicture(JSONArray.toJSONString(jsonArray));
}
-
-
-
-
records.add(vo);
}
}
// 5. 构建分页结果
- PageInfo<XpVehicleRepairVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ PageInfo<XpVehicleRepairMgtVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
pageInfo.setRecords(records);
pageInfo.setTotal(resultPage.getTotal());
--
Gitblit v1.7.1