From 9adef3dd7723930d44f72713c3cf28e50b002055 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 01 四月 2026 15:45:19 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpTestPlanServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpTestPlanServiceImpl.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpTestPlanServiceImpl.java
index 2418c05..32de1e0 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpTestPlanServiceImpl.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpTestPlanServiceImpl.java
@@ -77,12 +77,12 @@
.list().stream().collect(Collectors.groupingBy(XpTestPlanVehicle::getTestPlanId)) : Collections.emptyMap();
page.getRecords().forEach(plan -> {
if(pointMap.size() > 0){
- plan.setPointNum(pointMap.get(plan.getId()).size());
+ plan.setPointNum(null == pointMap.get(plan.getId()) ? 0 : pointMap.get(plan.getId()).size());
}else{
plan.setPointNum(0);
}
if(vehicleMap.size() > 0){
- plan.setVehicleNum(vehicleMap.get(plan.getId()).size());
+ plan.setVehicleNum(null == vehicleMap.get(plan.getId()) ? 0 : vehicleMap.get(plan.getId()).size());
}else{
plan.setVehicleNum(0);
}
@@ -217,6 +217,7 @@
vo.setEndTestPointName(point1.getPointName());
vo.setEndTestPointAddress(point1.getPointAddress());
}
+ vo.setStopFlag(planPoint.getStopFlag());
return vo;
}).collect(Collectors.toList());
@@ -380,6 +381,8 @@
point.setTestPlanId(planId);
point.setStartTestPointId(pointDTO.getStartTestPointId());
point.setEndTestPointId(pointDTO.getEndTestPointId());
+ point.setStopFlag(pointDTO.getStopFlag());
+ point.setTestOrderType(pointDTO.getTestOrderType());
result.add(point);
}
return result;
--
Gitblit v1.7.1