Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks

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

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

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

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

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

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

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

@@ -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);
                 }
             );