From b303ab6faaae0ae183a3db883688659f4026e99c Mon Sep 17 00:00:00 2001 From: dy <2389062315@qq.com> Date: Tue, 29 Jul 2025 15:47:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9B=BA=E5=AE=9A=E7=8F=AD?= =?UTF-8?q?=E5=88=B6=E4=B8=BB=E9=94=AE=E9=87=8D=E5=A4=8D=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/property/domain/bo/AttendanceGroupBo.java | 1 + .../service/impl/AttendanceArrangementServiceImpl.java | 6 +++++- .../property/service/impl/AttendanceGroupServiceImpl.java | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceGroupBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceGroupBo.java index 222f8a8..01e3fd5 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceGroupBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceGroupBo.java @@ -50,6 +50,7 @@ public class AttendanceGroupBo extends BaseEntity { List numList; + List weekSetList; 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 5a87edc..6c5c3c5 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 @@ -174,7 +174,11 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS @Override public List queryList(AttendanceArrangementBo bo) { - //1.根据开始时间和结束时间查询所有的排班信息 + //查看日历开始时间、结束时间和开始时间、结束时间的交集 + + + + //1.根据日历的开始时间和日历的结束时间查询所有的排班信息 List arrangementList = baseMapper.selectList(Wrappers.lambdaQuery().ge(AttendanceArrangement::getStartDate, bo.getCalendarStartDate()).le(AttendanceArrangement::getEndDate, bo.getCalendarEndTimeDate())); //2.查询人员组的信息 //根据开始时间查询排班的id diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java index 838dbad..878466d 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java @@ -203,11 +203,11 @@ public class AttendanceGroupServiceImpl implements IAttendanceGroupService { //3.排班制 if (Objects.equals(add.getAttendanceType(), StatusConstant.SHIFTSCHEDULE)) { - //2.2排班制，向天数表中插入数据 - AttendanceScheduleCycle attendanceScheduleCycle = new AttendanceScheduleCycle(); //循环向周期表中插入数据 bo.getNumList().forEach( num -> { + //2.2排班制，向天数表中插入数据 + AttendanceScheduleCycle attendanceScheduleCycle = new AttendanceScheduleCycle(); attendanceScheduleCycle.setGroupId(add.getId()); attendanceScheduleCycle.setDayNumber(num.getDayNumber()); attendanceScheduleCycleMapper.insert(attendanceScheduleCycle);