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

1
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m42s
Details

Browse Source
This commit is contained in:
dy
2025-08-15 16:00:44 +08:00
parent e66f29c665
commit e383f112d2
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,10 +146,10 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS
vo.setAttendanceGroup(attendanceGroup);
//3.根据id查询区域信息
Long areaId = vo.getAreaId();
// Long areaId = vo.getAreaId();
//根据区域id查询出区域的详细信息
AttendanceArea attendanceArea = attendanceAreaMapper.selectById(areaId);
vo.setAttendanceArea(attendanceArea);
// AttendanceArea attendanceArea = attendanceAreaMapper.selectById(areaId);
// vo.setAttendanceArea(attendanceArea);
//4.查询班制信息
//判断当前考勤组的班制是固定班制还是排班制

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

@@ -208,11 +208,11 @@ public class AttendanceUserGroupServiceImpl implements IAttendanceUserGroupServi
vo.setAttendanceGroup(attendanceGroup);
//3.根据id查询区域信息
Long areaId = arrangement.getAreaId();
//根据区域id查询出区域的详细信息
AttendanceArea attendanceArea = attendanceAreaMapper.selectById(areaId);
vo.setAttendanceArea(attendanceArea);
// //3.根据id查询区域信息
// Long areaId = arrangement.getAreaId();
// //根据区域id查询出区域的详细信息
// AttendanceArea attendanceArea = attendanceAreaMapper.selectById(areaId);
// vo.setAttendanceArea(attendanceArea);
// 判断当前考勤组的班制是固定班制还是排班制
if (Objects.equals(attendanceGroup.getAttendanceType(), StatusConstant.FIXEDSCHEDULE)) {