From 00b85990f4ae13f77c227abe491091b4e0548430 Mon Sep 17 00:00:00 2001
From: dy <2389062315@qq.com>
Date: Tue, 29 Jul 2025 09:37:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/AttendanceGroupServiceImpl.java      | 37 ++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

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 7a8bb23d..838dbadb 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
@@ -1,27 +1,27 @@
 package org.dromara.property.service.impl;
 
-import org.dromara.common.core.utils.MapstructUtils;
-import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.common.mybatis.core.page.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.property.domain.*;
+import org.dromara.property.domain.bo.AttendanceGroupBo;
 import org.dromara.property.domain.constant.StatusConstant;
+import org.dromara.property.domain.vo.AttendanceGroupVo;
 import org.dromara.property.mapper.*;
+import org.dromara.property.service.IAttendanceGroupService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
-import org.dromara.property.domain.bo.AttendanceGroupBo;
-import org.dromara.property.domain.vo.AttendanceGroupVo;
-import org.dromara.property.service.IAttendanceGroupService;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Collection;
 import java.util.Objects;
 
 import static org.dromara.property.domain.constant.StatusConstant.FIXEDSCHEDULE;
@@ -47,6 +47,7 @@ public class AttendanceGroupServiceImpl implements IAttendanceGroupService {
     private final AttendanceScheduleCycleMapper attendanceScheduleCycleMapper;
 
     private final AttendanceWeeksetShiftMapper attendanceWeeksetShiftMapper;
+
     private final AttendanceShiftMapper attendanceShiftMapper;
 
     /**
@@ -171,7 +172,6 @@ public class AttendanceGroupServiceImpl implements IAttendanceGroupService {
                     BeanUtils.copyProperties(weekSet, attendanceWeekSet);
                     attendanceWeekSet.setGroupId(add.getId());
                     attendanceWeekSet.setDayOfWeek(weekSet.getDayOfWeek());
-//                    attendanceWeekSet.setShiftId(weekSet.getShiftId());
                     weekSetMapper.insert(attendanceWeekSet);
                     //查询出周期表的id
                     Long weekSetId = attendanceWeekSet.getId();
@@ -223,7 +223,6 @@ public class AttendanceGroupServiceImpl implements IAttendanceGroupService {
 
 
         }
-//        insertAttendaanceClockDate(bo);
 
         return flag;
     }
@@ -260,17 +259,21 @@ public class AttendanceGroupServiceImpl implements IAttendanceGroupService {
             //1.固定班制
             //取出考勤组id
             Long groupId = update.getId();
-            //根据考勤组id查询出attendance_week_set表中的数据
-            List<AttendanceWeekSet> weekSets = weekSetMapper.selectList(Wrappers.<AttendanceWeekSet>lambdaQuery().eq(AttendanceWeekSet::getGroupId, groupId));
-            //根据weekSets修改考勤周期表中的数据
-            weekSets.forEach(
+            bo.getWeekSetList().forEach(
                 weekSet -> {
+                    //1.固定班制，修改考勤周期表中的数据
                     AttendanceWeekSet attendanceWeekSet = new AttendanceWeekSet();
                     BeanUtils.copyProperties(weekSet, attendanceWeekSet);
                     attendanceWeekSet.setGroupId(update.getId());
                     attendanceWeekSet.setDayOfWeek(weekSet.getDayOfWeek());
-                    attendanceWeekSet.setShiftId(weekSet.getShiftId());
-                    weekSetMapper.updateById(attendanceWeekSet);
+                    weekSetMapper.update(attendanceWeekSet, Wrappers.<AttendanceWeekSet>lambdaQuery().eq(AttendanceWeekSet::getId, weekSet.getId()));
+                    //查询出周期表的id
+                    Long weekSetId = attendanceWeekSet.getId();
+                    //根据weekSetId修改中间表中的数据
+                    AttendanceWeeksetShift attendanceWeeksetShift = new AttendanceWeeksetShift();
+                    attendanceWeeksetShift.setWeekSetId(weekSetId);
+                    attendanceWeeksetShift.setShiftId(weekSet.getShiftId());
+                    attendanceWeeksetShiftMapper.update(attendanceWeeksetShift, Wrappers.<AttendanceWeeksetShift>lambdaQuery().eq(AttendanceWeeksetShift::getWeekSetId, weekSetId));
                 }
             );