by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

考勤组bug修改
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details

Browse Source
This commit is contained in:
dy 2025-07-23 17:13:41 +08:00
parent 1388e918c3
commit 919d0937cd
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceGroupBo.java
View File

@ -9,6 +9,7 @@ import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*; import jakarta.validation.constraints.*;
import org.dromara.property.domain.AttendanceScheduleCycle;
import org.dromara.property.domain.AttendanceWeekSet; import org.dromara.property.domain.AttendanceWeekSet;
import java.util.Date; import java.util.Date;
@ -52,7 +53,7 @@ public class AttendanceGroupBo extends BaseEntity {
private Long shiftId; private Long shiftId;
List<Integer> numList; List<AttendanceScheduleCycle> numList;
List<AttendanceWeekSet> weekSetList; List<AttendanceWeekSet> weekSetList;
//前端传必须打卡还是无需打卡 //前端传必须打卡还是无需打卡

27
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java
View File

@ -193,18 +193,21 @@ public class AttendanceGroupServiceImpl implements IAttendanceGroupService {
//2.2排班制，向天数表中插入数据 //2.2排班制，向天数表中插入数据
AttendanceScheduleCycle attendanceScheduleCycle = new AttendanceScheduleCycle(); AttendanceScheduleCycle attendanceScheduleCycle = new AttendanceScheduleCycle();
//循环向周期表中插入数据 //循环向周期表中插入数据
for (Integer week : bo.getNumList()) { bo.getNumList().forEach(
attendanceScheduleCycle.setGroupId(add.getId()); num -> {
attendanceScheduleCycle.setDayNumber(week); attendanceScheduleCycle.setGroupId(add.getId());
attendanceScheduleCycleMapper.insert(attendanceScheduleCycle); attendanceScheduleCycle.setDayNumber(num.getDayNumber());
//获取周期表的id attendanceScheduleCycleMapper.insert(attendanceScheduleCycle);
Long scheduleId = attendanceScheduleCycle.getId(); //获取周期表的id
//向中间表插入周期的id Long scheduleId = attendanceScheduleCycle.getId();
AttendanceWeeksetShift attendanceWeeksetShift = new AttendanceWeeksetShift(); //向中间表插入周期的id
attendanceWeeksetShift.setWeekSetId(scheduleId); AttendanceWeeksetShift attendanceWeeksetShift = new AttendanceWeeksetShift();
attendanceWeeksetShift.setShiftId(bo.getShiftId()); attendanceWeeksetShift.setWeekSetId(scheduleId);
attendanceWeeksetShiftMapper.insert(attendanceWeeksetShift); attendanceWeeksetShift.setShiftId(bo.getShiftId());
} attendanceWeeksetShiftMapper.insert(attendanceWeeksetShift);
}
);
} }