From 6512fdd9c725c9b6cf5436df958e4fdf81ad82d0 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期六, 28 二月 2026 18:56:44 +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/controller/XpTaskManagementController.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskManagementController.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskManagementController.java
index 4759d41..b13cf8a 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskManagementController.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskManagementController.java
@@ -3,6 +3,7 @@
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
+import com.xiaopeng.api.feignClient.account.XpOperationUserClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.XpFleetOperationsClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient;
import com.xiaopeng.api.model.account.SysUser;
@@ -35,6 +36,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -46,7 +48,9 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -67,6 +71,8 @@
private TokenService tokenService;
@Resource
private IXpErrorTypeService xpErrorTypeService;
+ @Resource
+ private XpOperationUserClient operationUserClient;
@Resource
private XpFleetOperationsClient xpFleetOperationsClient;
@Resource
@@ -95,7 +101,18 @@
xpTaskExportExcel.setTaskTypeName(task.getTaskTypeName());
xpTaskExportExcel.setTaskUrgencyLevel(task.getTaskUrgencyLevel());
xpTaskExportExcel.setTaskDescription(task.getTaskDescription());
- xpTaskExportExcel.setHandleUserName(task.getHandleUserName());
+ if (StringUtils.hasLength(task.getHandleUserId())){
+ String[] split = task.getHandleUserId().split(",");
+
+ List<XpOperationsUser> users = operationUserClient.listByIds(Arrays.stream(split).map(Long::parseLong).collect(Collectors.toList())).getData();
+ if (users!=null){
+ StringBuilder handleUserName = new StringBuilder();
+ for (XpOperationsUser user : users) {
+ handleUserName.append(user.getNickName()).append(";");
+ }
+ xpTaskExportExcel.setHandleUserName(handleUserName.toString());
+ }
+ }
xpTaskExportExcel.setNumber(num);
xpTaskExportExcel.setStatus(task.getStatus());
LocalDateTime createTime = task.getCreateTime();
@@ -150,6 +167,9 @@
xpTaskService.saveTask(dto, reportUserId);
return R.ok();
}
+
+
+
@ApiOperation(value = "任务详情")
@GetMapping("/taskDetail")
public R<TaskManagementDetailVO> taskDetail(Long id) {
--
Gitblit v1.7.1