From 60a69aaa6ce99243ca8379cebf2b15ee8fa87eb1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 25 二月 2026 16:09:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java | 48 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 41 insertions(+), 7 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 f5d5989..a2f59d0 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
@@ -798,6 +798,35 @@
case "1":
// 检测
TaskManagementDetectionDetailVO taskManagementDetectionDetailVO = new TaskManagementDetectionDetailVO();
+ taskManagementDetectionDetailVO.setId(task.getId());
+ taskManagementDetectionDetailVO.setVehicleId(vehicle.getId());
+ taskManagementDetectionDetailVO.setTaskUrgencyLevel(task.getTaskUrgencyLevel());
+ taskManagementDetectionDetailVO.setPlateNumber(vehicle.getPlateNumber());
+ taskManagementDetectionDetailVO.setVehicleColor(vehicle.getVehicleColor());
+ taskManagementDetectionDetailVO.setVehicleCode(vehicle.getVehicleCode());
+ taskManagementDetectionDetailVO.setVehicleVin(vehicle.getVehicleVin());
+ taskManagementDetectionDetailVO.setVehicleLocation(task.getVehicleLocation());
+ taskManagementDetectionDetailVO.setTaskCode(task.getTaskCode());
+// taskManagementDetectionDetailVO.setNetworkDetection();
+// taskManagementDetectionDetailVO.setVersionVerification();
+// taskManagementDetectionDetailVO.setCommunicationSelfCheck();
+// taskManagementDetectionDetailVO.setRemoteSelfCheck();
+// taskManagementDetectionDetailVO.setCollisionPrevention();
+// taskManagementDetectionDetailVO.setSensorSelfCheck();
+// taskManagementDetectionDetailVO.setSensorCleaning();
+// taskManagementDetectionDetailVO.setSensorCleaningPicture();
+// taskManagementDetectionDetailVO.setInteractiveScreen();
+// taskManagementDetectionDetailVO.setInteractiveScreenPicture();
+// taskManagementDetectionDetailVO.setHelpButton();
+// taskManagementDetectionDetailVO.setHelpButtonPicture();
+// taskManagementDetectionDetailVO.setPaymentFunction();
+// taskManagementDetectionDetailVO.setPaymentFunctionPicture();
+// taskManagementDetectionDetailVO.setSystemCheck();
+// taskManagementDetectionDetailVO.setSystemCheckPicture();
+// taskManagementDetectionDetailVO.setOperationsUserId();
+// taskManagementDetectionDetailVO.setOperationsUserName();
+// taskManagementDetectionDetailVO.setCheckTime();
+
break;
case "2":
// 充电
@@ -826,14 +855,19 @@
res.setVehicleLocation(task.getVehicleLocation());
res.setVehicleVin(vehicle.getVehicleVin());
res.setTaskCode(task.getTaskCode());
- res.setTaskDescription(task.getTaskDescription());
- res.setTaskImage(task.getTaskImage());
- res.setHandleUserId(task.getHandleUserId());
- XpOperationsUser operationsUser = xpOperationUserClient.queryById(task.getHandleUserId()).getData();
- if (operationsUser != null){
- res.setHandleUserId(operationsUser.getId());
- res.setHandleUserName(operationsUser.getNickName());
+ XpTaskHandleDetailRoutine xpTaskHandleDetailRoutine = xpTaskHandleDetailRoutineMapper.selectOne(new LambdaQueryWrapper<XpTaskHandleDetailRoutine>()
+ .eq(XpTaskHandleDetailRoutine::getTaskId, id));
+ if (xpTaskHandleDetailRoutine!=null){
+ res.setTaskDescription(xpTaskHandleDetailRoutine.getTaskDescription());
+ res.setTaskImage(xpTaskHandleDetailRoutine.getTaskImage());
+ res.setHandleUserId(task.getHandleUserId());
+ XpOperationsUser operationsUser = xpOperationUserClient.queryById(xpTaskHandleDetailRoutine.getOperationsUserId()).getData();
+ if (operationsUser != null){
+ res.setHandleUserId(operationsUser.getId());
+ res.setHandleUserName(operationsUser.getNickName());
+ }
}
+
res.setHandleTime(task.getHandleTime());
res.setId(id);
res.setTaskUrgencyLevel(task.getTaskUrgencyLevel());
--
Gitblit v1.7.1