From ea0bb2911ae4a1671be87bf41349c1e5a516beb3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 27 二月 2026 17:34:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java | 62 ++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 2 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 5d3bfe2..d91c63f 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
@@ -55,6 +55,8 @@
public class XpTaskServiceImpl extends ServiceImpl<XpTaskMapper, XpTask> implements XpTaskService {
@Autowired
private RedissonClient redissonClient;
+ @Autowired
+ private XpErrorTypeMapper errorTypeMapper;
/**
* 常规任务类型映射
*/
@@ -82,8 +84,7 @@
private XpVehiclePreparationMapper vehiclePreparationMapper;
@Autowired
private XpVehicleDetectionMapper vehicleDetectionMapper;
- @Autowired
- private XpErrorTypeMapper errorTypeMapper;
+
@Autowired
private XpVehicleCleanMapper vehicleCleanMapper;
@Autowired
@@ -774,6 +775,62 @@
public PageInfo<TaskManagementPageListVO> pageListManagement(TaskManagementPageListQuery query) {
PageInfo<TaskManagementPageListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<TaskManagementPageListVO> list = this.baseMapper.pageListManagement(pageInfo, query);
+ for (TaskManagementPageListVO taskManagementPageListVO : list) {
+ if (taskManagementPageListVO.getTaskCategory() == 1) {
+ switch (taskManagementPageListVO.getTaskTypeId()) {
+ case "1":
+ taskManagementPageListVO.setTaskTypeName("车辆检查");
+ break;
+ case "2":
+ taskManagementPageListVO.setTaskTypeName("车辆充电");
+ break;
+ case "3":
+ taskManagementPageListVO.setTaskTypeName("车辆整备");
+ break;
+ case "4":
+ taskManagementPageListVO.setTaskTypeName("整备洗车");
+ break;
+ case "5":
+ taskManagementPageListVO.setTaskTypeName("车辆维修");
+ break;
+ case "6":
+ taskManagementPageListVO.setTaskTypeName("车辆保养");
+ break;
+ case "7":
+ taskManagementPageListVO.setTaskTypeName("车辆保险到期");
+ break;
+ case "8":
+ taskManagementPageListVO.setTaskTypeName("车辆年检到期");
+ break;
+ case "9":
+ taskManagementPageListVO.setTaskTypeName("车辆运营资质到期");
+ break;
+ default:
+ taskManagementPageListVO.setTaskTypeName("");
+ break;
+ }
+ }else{
+ StringBuilder taskTypeName = new StringBuilder();
+ String[] typeIds = taskManagementPageListVO.getTaskTypeId().split(",");
+ List<XpErrorType> xpErrorTypes = errorTypeMapper.selectList(new LambdaQueryWrapper<XpErrorType>()
+ .in(XpErrorType::getId, Arrays.asList(typeIds)).orderByAsc(XpErrorType::getParentId));
+ List<XpErrorType> parents = new ArrayList<>();
+ for (XpErrorType xpErrorType : xpErrorTypes) {
+ if (xpErrorType.getParentId() == 0) {
+ parents.add(xpErrorType);
+ }
+ }
+ for (XpErrorType parent : parents) {
+ List<XpErrorType> children = xpErrorTypes.stream().filter(e -> e.getParentId().equals(parent.getId())).collect(Collectors.toList());
+ taskTypeName.append(parent.getErrorName()).append(">");
+ for (XpErrorType child : children) {
+ taskTypeName.append(child.getErrorName()).append(";");
+ }
+ }
+
+ taskManagementPageListVO.setTaskTypeName(taskTypeName.substring(0, taskTypeName.length() - 1));
+ }
+ }
pageInfo.setRecords(list);
return pageInfo;
}
@@ -794,6 +851,7 @@
XpTask task = this.getById(id);
task.setAssigneeTime(LocalDateTime.now());
task.setHandleUserId(handlerUserId.toString());
+ task.setVehicleId(null);
task.setAssigneeUserId(assigneeUserId);
this.updateById(task);
return R.ok();
--
Gitblit v1.7.1