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 e4d67b5..3f18439 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 @@ -9,6 +9,7 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; +import org.dromara.property.domain.AttendanceScheduleCycle; import org.dromara.property.domain.AttendanceWeekSet; import java.util.Date; @@ -52,7 +53,7 @@ public class AttendanceGroupBo extends BaseEntity { private Long shiftId; - List numList; + List numList; List weekSetList; //前端传必须打卡还是无需打卡 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 c5b1c5f..1d6856e 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 @@ -193,18 +193,21 @@ public class AttendanceGroupServiceImpl implements IAttendanceGroupService { //2.2排班制,向天数表中插入数据 AttendanceScheduleCycle attendanceScheduleCycle = new AttendanceScheduleCycle(); //循环向周期表中插入数据 - for (Integer week : bo.getNumList()) { - attendanceScheduleCycle.setGroupId(add.getId()); - attendanceScheduleCycle.setDayNumber(week); - attendanceScheduleCycleMapper.insert(attendanceScheduleCycle); - //获取周期表的id - Long scheduleId = attendanceScheduleCycle.getId(); - //向中间表插入周期的id - AttendanceWeeksetShift attendanceWeeksetShift = new AttendanceWeeksetShift(); - attendanceWeeksetShift.setWeekSetId(scheduleId); - attendanceWeeksetShift.setShiftId(bo.getShiftId()); - attendanceWeeksetShiftMapper.insert(attendanceWeeksetShift); - } + bo.getNumList().forEach( + num -> { + attendanceScheduleCycle.setGroupId(add.getId()); + attendanceScheduleCycle.setDayNumber(num.getDayNumber()); + attendanceScheduleCycleMapper.insert(attendanceScheduleCycle); + //获取周期表的id + Long scheduleId = attendanceScheduleCycle.getId(); + //向中间表插入周期的id + AttendanceWeeksetShift attendanceWeeksetShift = new AttendanceWeeksetShift(); + attendanceWeeksetShift.setWeekSetId(scheduleId); + attendanceWeeksetShift.setShiftId(bo.getShiftId()); + attendanceWeeksetShiftMapper.insert(attendanceWeeksetShift); + } + ); + }