From d42e2c627fae618857daca06c308a40e1586b24b Mon Sep 17 00:00:00 2001 From: dy <2389062315@qq.com> Date: Tue, 29 Jul 2025 17:15:45 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E6=AC=A1id=E6=97=A0=E6=B3=95=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AttendanceGroupServiceImpl.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) 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 6e9a839..158d2db 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 @@ -90,26 +90,10 @@ public class AttendanceGroupServiceImpl implements IAttendanceGroupService { 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表 @@ -230,6 +214,7 @@ public class AttendanceGroupServiceImpl implements IAttendanceGroupService { AttendanceScheduleCycle attendanceScheduleCycle = new AttendanceScheduleCycle(); attendanceScheduleCycle.setGroupId(add.getId()); attendanceScheduleCycle.setDayNumber(num.getDayNumber()); + attendanceScheduleCycle.setShiftId(num.getShiftId()); attendanceScheduleCycleMapper.insert(attendanceScheduleCycle); //获取周期表的id Long scheduleId = attendanceScheduleCycle.getId();