From b1f26aebe882d31df351f875d59eefc946aee295 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 27 二月 2026 12:30:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 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 ae728e1..a3d08bf 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
@@ -226,7 +226,7 @@
}
task.setHandleTime(LocalDateTime.now());
- task.setHandleUserId(xpOperationsUser.getId());
+ task.setHandleUserId(xpOperationsUser.getId().toString());
task.setStatus(2);
// 存储事故处理日志
XpTaskHandleDetail xpTaskHandleDetail = new XpTaskHandleDetail();
@@ -282,8 +282,8 @@
res.setTaskImage(task.getTaskImage());
res.setHandleUserId(task.getHandleUserId());
res.setHandleTime(task.getHandleTime());
- if (Objects.nonNull(task.getHandleUserId())) {
- XpOperationsUser data = xpOperationUserClient.queryById(task.getHandleUserId()).getData();
+ if (Objects.nonNull(task.getHandleUserId())&&task.getHandleUserId().split(",").length==1) {
+ XpOperationsUser data = xpOperationUserClient.queryById(Long.valueOf(task.getHandleUserId())).getData();
if (Objects.nonNull(data)) {
res.setHandleUserName(data.getNickName());
}
@@ -617,7 +617,7 @@
}
@Override
- public R confirmArrive(Long id) {
+ public R confirmArrive(Long id,Long userId) {
XpTask task = this.getById(id);
if (task!=null){
task.setStatus(1);
@@ -759,7 +759,7 @@
public R assigneeTask(Long id, Long handlerUserId,Long assigneeUserId) {
XpTask task = this.getById(id);
task.setAssigneeTime(LocalDateTime.now());
- task.setHandleUserId(handlerUserId);
+ task.setHandleUserId(handlerUserId.toString());
task.setAssigneeUserId(assigneeUserId);
this.updateById(task);
return R.ok();
@@ -1027,7 +1027,7 @@
res.setHandleUserId(task.getHandleUserId());
XpOperationsUser operationsUser = xpOperationUserClient.queryById(xpTaskHandleDetailRoutine.getOperationsUserId()).getData();
if (operationsUser != null){
- res.setHandleUserId(operationsUser.getId());
+ res.setHandleUserId(operationsUser.getId().toString());
res.setHandleUserName(operationsUser.getNickName());
}
}
@@ -1079,12 +1079,14 @@
res.setReportUserPhone(sysUser.getPhoneNumber());
res.setReportUserAvatar(sysUser.getAvatar());
}
- XpOperationsUser operationsUser = xpOperationUserClient.queryById(task.getHandleUserId()).getData();
- if (operationsUser != null){
- res.setHandleUserId(operationsUser.getId());
- res.setHandleUserName(operationsUser.getNickName());
- res.setHandleUserPhone(operationsUser.getPhoneNumber());
- res.setHandleUserAvatar(operationsUser.getAvatar());
+ if (task.getHandleUserId().split(",").length==1){
+ XpOperationsUser operationsUser = xpOperationUserClient.queryById(Long.valueOf(task.getHandleUserId())).getData();
+ if (operationsUser != null){
+ res.setHandleUserId(operationsUser.getId());
+ res.setHandleUserName(operationsUser.getNickName());
+ res.setHandleUserPhone(operationsUser.getPhoneNumber());
+ res.setHandleUserAvatar(operationsUser.getAvatar());
+ }
}
XpTaskHandleDetail xpTaskHandleDetail = xpTaskHandleDetailMapper.selectOne(new LambdaQueryWrapper<XpTaskHandleDetail>()
.eq(XpTaskHandleDetail::getTaskId, id));
--
Gitblit v1.7.1