From 1fb894756c7e04b7b1d51d6dc74da19367fa02fd Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期日, 15 三月 2026 23:29:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 6017864..81d9d30 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
@@ -176,11 +176,11 @@
PageInfo<TaskPageListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<TaskPageListVO> list = this.baseMapper.pageList(pageInfo, query);
XpTaskRule xpTaskRule = xpTaskRuleMapper.selectOne(new LambdaQueryWrapper<XpTaskRule>().last("limit 1"));
-// if (Objects.nonNull(xpTaskRule)) {
-// list.stream().filter(item -> item.getTaskCategory().equals(2)).forEach(item -> {
-// item.setCanArriveRange(xpTaskRule.getCanArriveRange());
-// });
-// }
+ if (Objects.nonNull(xpTaskRule)) {
+ list.stream().filter(item -> item.getTaskCategory().equals(2)).forEach(item -> {
+ item.setCanArriveRange(xpTaskRule.getCanArriveRange());
+ });
+ }
pageInfo.setRecords(list);
return pageInfo;
}
@@ -815,10 +815,10 @@
res.setTaskCategory(task.getTaskCategory());
res.setTaskTypeId(task.getTaskTypeId());
res.setStatus(task.getStatus());
- res.setHandleTime(task.getHandleTime());
XpVehicleClean vehicleDetection = vehicleCleanMapper.selectOne(new LambdaQueryWrapper<XpVehicleClean>()
.eq(XpVehicleClean::getTaskId, id).last("limit 1"));
if (vehicleDetection != null) {
+ res.setHandleTime(vehicleDetection.getCreateTime());
res.setTaskImage(vehicleDetection.getTaskImage());
res.setOperationUserId(vehicleDetection.getOperationsUserId());
if (vehicleDetection.getOperationsUserId() != null) {
--
Gitblit v1.7.1