From 856e01ca04d1cc88f4efe560426e97cbd9f7f489 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期六, 28 二月 2026 14:06:35 +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/service/impl/XpTaskServiceImpl.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 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 5d4810a..ae9ac9f 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
@@ -949,6 +949,7 @@
task.setVehicleLat(dto.getVehicleLat());
task.setReportUserId(reportUserId);
task.setReportTime(LocalDateTime.now());
+ saveTask.add( task);
}
this.saveBatch(saveTask);
@@ -1246,16 +1247,19 @@
}
XpTaskHandleDetail xpTaskHandleDetail = xpTaskHandleDetailMapper.selectOne(new LambdaQueryWrapper<XpTaskHandleDetail>()
.eq(XpTaskHandleDetail::getTaskId, id));
- res.setDeathCount(xpTaskHandleDetail.getDeathCount());
- res.setSevereCount(xpTaskHandleDetail.getSevereCount());
- res.setMinorCount(xpTaskHandleDetail.getMinorCount());
- res.setResponsibilityJudgment(xpTaskHandleDetail.getResponsibilityJudgment());
- res.setResponsibleDescription(xpTaskHandleDetail.getResponsibleDescription());
- res.setResponsibleImage(xpTaskHandleDetail.getResponsibleImage());
- res.setDisposalDescription(xpTaskHandleDetail.getDisposalDescription());
- res.setDisposalImage(xpTaskHandleDetail.getDisposalImage());
- res.setSituationDescription(xpTaskHandleDetail.getSituationDescription());
- res.setSituationImage(xpTaskHandleDetail.getSituationImage());
+ if (xpTaskHandleDetail != null){
+ res.setDeathCount(xpTaskHandleDetail.getDeathCount());
+ res.setSevereCount(xpTaskHandleDetail.getSevereCount());
+ res.setMinorCount(xpTaskHandleDetail.getMinorCount());
+ res.setResponsibilityJudgment(xpTaskHandleDetail.getResponsibilityJudgment());
+ res.setResponsibleDescription(xpTaskHandleDetail.getResponsibleDescription());
+ res.setResponsibleImage(xpTaskHandleDetail.getResponsibleImage());
+ res.setDisposalDescription(xpTaskHandleDetail.getDisposalDescription());
+ res.setDisposalImage(xpTaskHandleDetail.getDisposalImage());
+ res.setSituationDescription(xpTaskHandleDetail.getSituationDescription());
+ res.setSituationImage(xpTaskHandleDetail.getSituationImage());
+ }
+
managementDetailVO.setAccidentDetailVO(res);
}
return R.ok(managementDetailVO);
--
Gitblit v1.7.1