From ceb3960eb6c4975265b8c51368f7afe224129e75 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 28 二月 2026 21:23:48 +0800
Subject: [PATCH] 合并代码
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpSchedulingDetailServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 c875a51..e3e5dde 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
@@ -400,7 +400,7 @@
String month = vo.getMonth();
List<XpSchedulingDetail> list = this.list(new QueryWrapper<XpSchedulingDetail>().eq("is_deleted", 0).last(" and DATE_FORMAT(plan_time,'%Y-%m') = '" + month + "'"));
//保存排班数据
- XpScheduling xpScheduling = xpSchedulingService.getOne(new QueryWrapper<XpScheduling>().eq("is_deleted", 0).last(" and DATE_FORMAT(schedulingDate,'%Y-%m') = '" + month + "'"));
+ XpScheduling xpScheduling = xpSchedulingService.getOne(new QueryWrapper<XpScheduling>().eq("is_deleted", 0).last(" and DATE_FORMAT(scheduling_date,'%Y-%m') = '" + month + "'"));
if(null == xpScheduling){
xpScheduling = new XpScheduling();
xpScheduling.setDeleted(false);
@@ -471,13 +471,15 @@
schedulingDetail.setShiftId(shiftId);
XpShift xpShift = xpShifts.stream().filter(s -> s.getId().equals(shiftId)).findAny().orElse(null);
- schedulingDetail.setIsAllDay(xpShift.getShiftName().contains("全天"));
- schedulingDetail.setPlanTime(parse);
- schedulingDetails.add(schedulingDetail);
+ if(null != xpShift){
+ schedulingDetail.setIsAllDay(xpShift.getShiftName().contains("全天"));
+ schedulingDetail.setPlanTime(parse);
+ schedulingDetails.add(schedulingDetail);
+ }
}
}
//批量保存排班明细数据
- if(schedulingDetails.isEmpty()){
+ if(!schedulingDetails.isEmpty()){
this.saveOrUpdateBatch(schedulingDetails);
}
//异步处理消息通知数据
--
Gitblit v1.7.1