From 6cc04a9cac9068c934fd96d71af5e5f123bf54f6 Mon Sep 17 00:00:00 2001
From: dy <2389062315@qq.com>
Date: Fri, 25 Jul 2025 10:26:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9id=E4=BC=A0=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/property/domain/AttendanceScheduleCycle.java  | 2 ++
 .../java/org/dromara/property/domain/AttendanceWeekSet.java   | 2 ++
 .../org/dromara/property/domain/bo/AttendanceGroupBo.java     | 4 ----
 .../property/service/impl/AttendanceGroupServiceImpl.java     | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceScheduleCycle.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceScheduleCycle.java
index 419f752..d935277 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceScheduleCycle.java
+++ b/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;
+
 
 }
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceWeekSet.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceWeekSet.java
index ed01208..e57f28c 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceWeekSet.java
+++ b/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;
+
 
 }
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 5211895..e4aab70 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
@@ -47,10 +47,6 @@ public class AttendanceGroupBo extends BaseEntity {
      */
     private Long attendanceType;
 
-    /**
-     *前端传班次id
-     */
-    private Long shiftId;
 
 
     List<AttendanceScheduleCycle> numList;
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 0476609..3c8e352 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
@@ -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);
                 }
             );