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

Merge remote-tracking branch 'origin/master'
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details

Browse Source
This commit is contained in:
zcxlsm 2025-07-25 21:29:19 +08:00
commit b1fb876181
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceScheduleCycle.java
View File

@ -42,5 +42,7 @@ public class AttendanceScheduleCycle extends TenantEntity {
*/
private Long isRest;
private Long scheduleId;
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceWeekSet.java
View File

@ -42,5 +42,7 @@ public class AttendanceWeekSet extends TenantEntity {
*/
private Integer isRest;
private Long shiftId;
}

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

@ -47,10 +47,6 @@ public class AttendanceGroupBo extends BaseEntity {
*/
private Long attendanceType;
/**
*前端传班次id
*/
private Long shiftId;
List<AttendanceScheduleCycle> numList;

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

@ -169,7 +169,7 @@ public class AttendanceGroupServiceImpl implements IAttendanceGroupService {
//向中间表插入周期的id
AttendanceWeeksetShift attendanceWeeksetShift = new AttendanceWeeksetShift();
attendanceWeeksetShift.setWeekSetId(weekSetId);
attendanceWeeksetShift.setShiftId(bo.getShiftId());
attendanceWeeksetShift.setShiftId(weekSet.getShiftId());
attendanceWeeksetShiftMapper.insert(attendanceWeeksetShift);
}
);
@ -202,7 +202,7 @@ public class AttendanceGroupServiceImpl implements IAttendanceGroupService {
//向中间表插入周期的id
AttendanceWeeksetShift attendanceWeeksetShift = new AttendanceWeeksetShift();
attendanceWeeksetShift.setWeekSetId(scheduleId);
attendanceWeeksetShift.setShiftId(bo.getShiftId());
attendanceWeeksetShift.setShiftId(num.getScheduleId());
attendanceWeeksetShiftMapper.insert(attendanceWeeksetShift);
}
);