From 28143d17e7a8234a77a7fac17139d46753c66aa4 Mon Sep 17 00:00:00 2001 From: dy <2389062315@qq.com> Date: Tue, 29 Jul 2025 16:59:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/AttendanceScheduleCycle.java | 2 +- .../property/domain/bo/AttendanceGroupBo.java | 1 - .../property/domain/vo/AttendanceGroupVo.java | 4 ++ .../AttendanceArrangementServiceImpl.java | 7 +++- .../impl/AttendanceGroupServiceImpl.java | 38 ++++++++++++++----- 5 files changed, 40 insertions(+), 12 deletions(-) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceScheduleCycle.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceScheduleCycle.java index d935277..8787667 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceScheduleCycle.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceScheduleCycle.java @@ -42,7 +42,7 @@ public class AttendanceScheduleCycle extends TenantEntity { */ private Long isRest; - private Long scheduleId; + private Long shiftId; } 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 01e3fd5..222f8a8 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,7 +50,6 @@ public class AttendanceGroupBo extends BaseEntity { List numList; - List weekSetList; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceGroupVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceGroupVo.java index 44c1c8f..b8ae394 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceGroupVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceGroupVo.java @@ -61,5 +61,9 @@ public class AttendanceGroupVo implements Serializable { List clockDateList; + List scheduleCycleList; + + + } 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 6c5c3c5..2271d73 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,12 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS @Override public List queryList(AttendanceArrangementBo bo) { - //查看日历开始时间、结束时间和开始时间、结束时间的交集 + Date startDate = bo.getStartDate(); + Date endDate = bo.getEndDate(); + Date calendarStartDate = bo.getCalendarStartDate(); + Date calendarEndTimeDate = bo.getCalendarEndTimeDate(); + + 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 878466d..6e9a839 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 @@ -78,18 +78,38 @@ public class AttendanceGroupServiceImpl implements IAttendanceGroupService { vo.setWeekList(weekSets); } else if (Objects.equals(attendanceType, SHIFTSCHEDULE)) { //2.排班制 - //2.1根据id参数查询考勤周期表 - List weekSets = weekSetMapper.selectList(Wrappers.lambdaQuery().eq(AttendanceWeekSet::getGroupId, id)); + //2.1根据id参数查询考勤天数表 + List scheduleCycles = attendanceScheduleCycleMapper.selectList(Wrappers.lambdaQuery().eq(AttendanceScheduleCycle::getGroupId, id)); //2.2根据id参数取出所有考勤天数id - List weekSetIds = weekSets.stream().map(AttendanceWeekSet::getId).toList(); - //2.3根据天数id查询出中间表 - List scheduleCycles = attendanceScheduleCycleMapper.selectList(Wrappers.lambdaQuery().in(AttendanceScheduleCycle::getGroupId, weekSetIds)); - //2.4根据中间表的班次id查询出班次表id List scheduleCycleIds = scheduleCycles.stream().map(AttendanceScheduleCycle::getId).toList(); - //2.5根据班次id查询出班次表 - List shifts = attendanceShiftMapper.selectList(Wrappers.lambdaQuery().in(AttendanceShift::getId, scheduleCycleIds)); + //2.3根据天数id查询出中间表 + List weeksetShifts = attendanceWeeksetShiftMapper.selectList(Wrappers.lambdaQuery().in(AttendanceWeeksetShift::getWeekSetId, scheduleCycleIds)); + //2.4根据中间表的班次id查询出班次表id + List weeksetShiftIds = weeksetShifts.stream().map(AttendanceWeeksetShift::getId).toList(); + //根据id查询出shiftId + List shiftIds = weeksetShifts.stream().map(AttendanceWeeksetShift::getShiftId).toList(); + //2.5根据shiftId查询出班次表 + List shifts = attendanceShiftMapper.selectList(Wrappers.lambdaQuery().in(AttendanceShift::getId, shiftIds)); + + +// //2.5根据班次id查询出班次表 +// List shifts = attendanceShiftMapper.selectList(Wrappers.lambdaQuery().in(AttendanceShift::getId, weeksetShiftIds)); //2.6将查询后的数据封装到attendanceGroupVo中 vo.setAttendanceList(shifts); + vo.setScheduleCycleList(scheduleCycles); + + +// List weekSets = weekSetMapper.selectList(Wrappers.lambdaQuery().eq(AttendanceWeekSet::getGroupId, id)); +// //2.2根据id参数取出所有考勤天数id +// List weekSetIds = weekSets.stream().map(AttendanceWeekSet::getId).toList(); +// //2.3根据天数id查询出中间表 +// List scheduleCycles = attendanceScheduleCycleMapper.selectList(Wrappers.lambdaQuery().in(AttendanceScheduleCycle::getGroupId, weekSetIds)); +// //2.4根据中间表的班次id查询出班次表id +// List scheduleCycleIds = scheduleCycles.stream().map(AttendanceScheduleCycle::getId).toList(); +// //2.5根据班次id查询出班次表 +// List shifts = attendanceShiftMapper.selectList(Wrappers.lambdaQuery().in(AttendanceShift::getId, scheduleCycleIds)); +// //2.6将查询后的数据封装到attendanceGroupVo中 +// vo.setAttendanceList(shifts); } //根据id查询attendance_clock_date表 @@ -216,7 +236,7 @@ public class AttendanceGroupServiceImpl implements IAttendanceGroupService { //向中间表插入周期的id AttendanceWeeksetShift attendanceWeeksetShift = new AttendanceWeeksetShift(); attendanceWeeksetShift.setWeekSetId(scheduleId); - attendanceWeeksetShift.setShiftId(num.getScheduleId()); + attendanceWeeksetShift.setShiftId(num.getShiftId()); attendanceWeeksetShiftMapper.insert(attendanceWeeksetShift); } );