From 4893a04d3909ba9cdd3bb4d3e75c230a34a5b350 Mon Sep 17 00:00:00 2001 From: dy <2389062315@qq.com> Date: Thu, 7 Aug 2025 17:22:39 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E6=95=B0=E6=8D=AE=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E6=9F=A5=E8=AF=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AttendanceArrangementServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceArrangementServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceArrangementServiceImpl.java index b11c8250..e14f152b 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceArrangementServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceArrangementServiceImpl.java @@ -97,7 +97,7 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS Page attendanceArrangementVoPage = result.setRecords(result.getRecords().stream().map(vo -> { //根据当前日期查询在开始时间和结束时间之间的排班信息 //从前端查询出来的当前日期，判断是否在排班时间内 - if (bo.getCurrentDate().isAfter(vo.getStartDate()) && bo.getCurrentDate().isBefore(vo.getEndDate())) { + if ((bo.getCurrentDate().isAfter(vo.getStartDate()) || bo.getCurrentDate().isEqual(vo.getStartDate())) && (bo.getCurrentDate().isBefore(vo.getEndDate()) || bo.getCurrentDate().isEqual(vo.getEndDate()))) { //1.查询人员表信息 //根据查询出来的result取出shceduleId Long scheduleId = vo.getId(); @@ -436,6 +436,10 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS } judgeDate(bo, add); + + + + //取出当前新增的排班的id Long ArrangementId = add.getId(); //用获取到的排班id向attendanceUserGroup表中插入数据