From b765c6694795d306cdedf52d6edc9c6119d4b9f3 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 11 三月 2026 00:50:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpSchedulingDetailServiceImpl.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpSchedulingDetailServiceImpl.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpSchedulingDetailServiceImpl.java
index 789c933..0886761 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpSchedulingDetailServiceImpl.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpSchedulingDetailServiceImpl.java
@@ -438,7 +438,6 @@
LocalDate parse = LocalDate.parse(day.getDayTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd"));
//查询判断数据是否存在
XpSchedulingDetail schedulingDetail = list.stream().filter(s -> s.getFleetId().equals(fleetId)
- && s.getShiftId().equals(shiftId)
&& s.getPlanTime().equals(parse)
).findAny().orElse(null);
//构建存储对象
@@ -481,9 +480,9 @@
XpShift xpShift = xpShifts.stream().filter(s -> s.getId().equals(shiftId)).findAny().orElse(null);
if (null != xpShift) {
schedulingDetail.setIsAllDay(xpShift.getShiftName().contains("全天"));
- schedulingDetail.setPlanTime(parse);
- schedulingDetails.add(schedulingDetail);
}
+ schedulingDetail.setPlanTime(parse);
+ schedulingDetails.add(schedulingDetail);
}
}
//批量保存排班明细数据
--
Gitblit v1.7.1