From e31af276a0d690ed8b115a46ce4095d859c93576 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期六, 28 二月 2026 16:13:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java
index c49f456..ff59b4f 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java
@@ -945,6 +945,8 @@
task.setEndTime(LocalDateTime.now().plusMinutes(taskRule.getProcessingTimeLimit()));
}
task.setTaskCategory(2);
+ // todo 临时处理
+ task.setHandleUserId("1");
task.setTaskTypeId(dto.getTaskTypeId());
task.setTaskUrgencyLevel(dto.getTaskUrgencyLevel());
task.setTaskDescription(dto.getTaskDescription());
@@ -994,6 +996,7 @@
taskManagementDetectionDetailVO.setVehicleCode(vehicle.getVehicleCode());
taskManagementDetectionDetailVO.setVehicleVin(vehicle.getVehicleVin());
taskManagementDetectionDetailVO.setVehicleLocation(task.getVehicleLocation());
+ taskManagementDetectionDetailVO.setVehiclePictures(vehicle.getVehiclePictures());
taskManagementDetectionDetailVO.setTaskCode(task.getTaskCode());
XpVehicleDetection vehicleDetection = vehicleDetectionMapper.selectOne(new LambdaQueryWrapper<XpVehicleDetection>()
.eq(XpVehicleDetection::getTaskId, id).last("limit 1"));
@@ -1037,6 +1040,8 @@
taskManagementChargingDetailVO.setVehicleVin(vehicle.getVehicleVin());
taskManagementChargingDetailVO.setVehicleLocation(task.getVehicleLocation());
taskManagementChargingDetailVO.setTaskCode(task.getTaskCode());
+ taskManagementChargingDetailVO.setVehiclePictures(vehicle.getVehiclePictures());
+
XpChargingRecord chargingRecord = chargingRecordMapper.selectOne(new LambdaQueryWrapper<XpChargingRecord>()
.eq(XpChargingRecord::getTaskId, id).last("limit 1"));
if (chargingRecord != null) {
@@ -1076,6 +1081,8 @@
taskManagementPreparationDetailVO.setVehicleVin(vehicle.getVehicleVin());
taskManagementPreparationDetailVO.setVehicleLocation(task.getVehicleLocation());
taskManagementPreparationDetailVO.setTaskCode(task.getTaskCode());
+ taskManagementPreparationDetailVO.setVehiclePictures(vehicle.getVehiclePictures());
+
XpVehiclePreparation vehiclePreparation = vehiclePreparationMapper.selectOne(new LambdaQueryWrapper<XpVehiclePreparation>()
.eq(XpVehiclePreparation::getTaskId, id).last("limit 1"));
if (vehiclePreparation != null) {
@@ -1115,6 +1122,8 @@
taskManagementCleanDetailVO.setVehicleVin(vehicle.getVehicleVin());
taskManagementCleanDetailVO.setVehicleLocation(task.getVehicleLocation());
taskManagementCleanDetailVO.setTaskCode(task.getTaskCode());
+ taskManagementCleanDetailVO.setVehiclePictures(vehicle.getVehiclePictures());
+
XpVehicleClean vehicleClean = vehicleCleanMapper.selectOne(new LambdaQueryWrapper<XpVehicleClean>()
.eq(XpVehicleClean::getTaskId, id).last("limit 1"));
if (vehicleClean != null) {
@@ -1142,6 +1151,8 @@
taskManagementRepairDetailVO.setVehicleVin(vehicle.getVehicleVin());
taskManagementRepairDetailVO.setVehicleLocation(task.getVehicleLocation());
taskManagementRepairDetailVO.setTaskCode(task.getTaskCode());
+ taskManagementRepairDetailVO.setVehiclePictures(vehicle.getVehiclePictures());
+
XpVehicleRepair vehicleRepair = vehicleRepairMapper.selectOne(new LambdaQueryWrapper<XpVehicleRepair>()
.eq(XpVehicleRepair::getTaskId, id).last("limit 1"));
if (vehicleRepair != null) {
@@ -1182,6 +1193,7 @@
res.setVehicleLocation(task.getVehicleLocation());
res.setVehicleVin(vehicle.getVehicleVin());
res.setTaskCode(task.getTaskCode());
+ res.setVehiclePictures(vehicle.getVehiclePictures());
XpTaskHandleDetailRoutine xpTaskHandleDetailRoutine = xpTaskHandleDetailRoutineMapper.selectOne(new LambdaQueryWrapper<XpTaskHandleDetailRoutine>()
.eq(XpTaskHandleDetailRoutine::getTaskId, id));
if (xpTaskHandleDetailRoutine != null) {
@@ -1220,6 +1232,8 @@
for (XpErrorType xpErrorType : xpErrorTypes) {
xpErrorType.setChild(errorType.get(xpErrorType.getId()));
}
+ res.setCreateTime(task.getCreateTime());
+ res.setHandleTime(task.getHandleTime());
res.setErrorTypeList(xpErrorTypes);
res.setStatus(task.getStatus());
res.setTaskDescription(task.getTaskDescription());
--
Gitblit v1.7.1