From ab9cbec676c67cedf2590c5f0a90a458989f5c8f Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期六, 14 三月 2026 18:02:33 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java | 9 +++++++++
1 files changed, 9 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 9d09a44..e9cdceb 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
@@ -453,6 +453,9 @@
I18nKeyConstant.VEHICLE_NOT_EXIST
);
}
+ //查询任务处理记录
+ XpTaskHandleDetailRoutine xpTaskHandleDetailRoutine = xpTaskHandleDetailRoutineMapper.selectOne(new LambdaQueryWrapper<XpTaskHandleDetailRoutine>()
+ .eq(XpTaskHandleDetailRoutine::getTaskId, id).last("limit 1"));
res.setId(id);
res.setTaskUrgencyLevel(task.getTaskUrgencyLevel());
res.setEndTime(task.getEndTime());
@@ -474,6 +477,12 @@
res.setTaskImage(task.getTaskImage());
res.setHandleUserId(task.getHandleUserId());
res.setHandleTime(task.getHandleTime());
+ if (Objects.nonNull(xpTaskHandleDetailRoutine)) {
+ res.setTaskDescription(xpTaskHandleDetailRoutine.getTaskDescription());
+ task.setHandleUserId(xpTaskHandleDetailRoutine.getOperationsUserId().toString());
+ res.setHandleTime(xpTaskHandleDetailRoutine.getCreateTime());
+ res.setTaskImage(xpTaskHandleDetailRoutine.getTaskImage());
+ }
if (Objects.nonNull(task.getHandleUserId()) && task.getHandleUserId().split(",").length == 1) {
XpOperationsUser data = xpOperationUserClient.queryById(Long.valueOf(task.getHandleUserId())).getData();
if (Objects.nonNull(data)) {
--
Gitblit v1.7.1