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

修改

Browse Source
This commit is contained in:
dy
2025-07-29 09:37:11 +08:00
parent bee90b70d1
commit 00b85990f4
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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