ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into frx

Browse Source
This commit is contained in:
furongxin 2024-07-08 16:02:15 +08:00
commit e5d809fba1
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceServiceImpl.java
View File

@ -564,12 +564,12 @@ public class AttendanceServiceImpl implements AttendanceService {
public Map<String, TeamAttendanceStatisticsByDayVO> teamStatisticsByDay(TeamAttendanceStatisticsByDayDTO dto) { public Map<String, TeamAttendanceStatisticsByDayVO> teamStatisticsByDay(TeamAttendanceStatisticsByDayDTO dto) {
Map<String, TeamAttendanceStatisticsByDayVO> map = new HashMap<>(); Map<String, TeamAttendanceStatisticsByDayVO> map = new HashMap<>();
//查询考勤组 //查询考勤组
AttendanceGroupDO attendanceGroupDO = attendanceGroupService.getGroup(dto.getGroupId()); // AttendanceGroupDO attendanceGroupDO = attendanceGroupService.getGroup(dto.getGroupId());
// - 判断当前用户是否有权限查看 // - 判断当前用户是否有权限查看
// TODO: 2024/5/28 这里需要根据数据权限再过滤一下 ？ 或者说移动端不让看 有数据权限的直接在管理后台看 // TODO: 2024/5/28 这里需要根据数据权限再过滤一下 ？ 或者说移动端不让看 有数据权限的直接在管理后台看
if (!dto.getUserId().equals(attendanceGroupDO.getUserId())) { // if (!dto.getUserId().equals(attendanceGroupDO.getUserId())) {
throw exception(NO_PERMISSION_TO_VIEW_CURRENT_ATTENDANCE_GROUP_INFORMATION); // throw exception(NO_PERMISSION_TO_VIEW_CURRENT_ATTENDANCE_GROUP_INFORMATION);
} // }
List<String> dateList = DateUtils.betweenDayList(DateUtil.beginOfMonth(dto.getTime()), List<String> dateList = DateUtils.betweenDayList(DateUtil.beginOfMonth(dto.getTime()),
DateUtil.endOfMonth(dto.getTime())); DateUtil.endOfMonth(dto.getTime()));
List<AttendancePunchRecordDO> list = attendancePunchRecordMapper.selectList(new LambdaQueryWrapper<AttendancePunchRecordDO>() List<AttendancePunchRecordDO> list = attendancePunchRecordMapper.selectList(new LambdaQueryWrapper<AttendancePunchRecordDO>()
@ -617,12 +617,12 @@ public class AttendanceServiceImpl implements AttendanceService {
public TeamAttendanceStatisticsByCycleVO tesmStatisticsByCycle(TeamAttendanceStatisticsByCycleDTO dto) { public TeamAttendanceStatisticsByCycleVO tesmStatisticsByCycle(TeamAttendanceStatisticsByCycleDTO dto) {
TeamAttendanceStatisticsByCycleVO vo = new TeamAttendanceStatisticsByCycleVO(); TeamAttendanceStatisticsByCycleVO vo = new TeamAttendanceStatisticsByCycleVO();
//查询考勤组 //查询考勤组
AttendanceGroupDO attendanceGroupDO = attendanceGroupService.getGroup(dto.getGroupId()); // AttendanceGroupDO attendanceGroupDO = attendanceGroupService.getGroup(dto.getGroupId());
// - 判断当前用户是否有权限查看 // - 判断当前用户是否有权限查看
// TODO: 2024/5/28 这里需要根据数据权限再过滤一下 ？ 或者说移动端不让看 有数据权限的直接在管理后台看 // TODO: 2024/5/28 这里需要根据数据权限再过滤一下 ？ 或者说移动端不让看 有数据权限的直接在管理后台看
if (!dto.getUserId().equals(attendanceGroupDO.getUserId())) { // if (!dto.getUserId().equals(attendanceGroupDO.getUserId())) {
throw exception(NO_PERMISSION_TO_VIEW_CURRENT_ATTENDANCE_GROUP_INFORMATION); // throw exception(NO_PERMISSION_TO_VIEW_CURRENT_ATTENDANCE_GROUP_INFORMATION);
} // }
Date thisTime = new Date(); Date thisTime = new Date();
Date beginTime = dto.getStartTime(); Date beginTime = dto.getStartTime();
Date endTime = dto.getEndTime(); Date endTime = dto.getEndTime();
@ -791,13 +791,13 @@ public class AttendanceServiceImpl implements AttendanceService {
List<AdminUserDO> userList = new ArrayList<>(); List<AdminUserDO> userList = new ArrayList<>();
List<Long> userIds = new ArrayList<>(); List<Long> userIds = new ArrayList<>();
if (dto.getMemberRange() == 1) { if (dto.getMemberRange() == 1) {
userList = adminUserService.getAllList(CommonStatusEnum.ENABLE.getStatus(), null, userIds); userList = adminUserService.getAllList(null, null, userIds);
} else if (dto.getMemberRange() == 2) { } else if (dto.getMemberRange() == 2) {
// -- 获取考勤组ids // -- 获取考勤组ids
userIds = attendanceGroupUserService.getUserIdsByGroupIds(dto.getTargetIds()); userIds = attendanceGroupUserService.getUserIdsByGroupIds(dto.getTargetIds());
userList = adminUserService.getAllList(CommonStatusEnum.ENABLE.getStatus(), null, userIds); userList = adminUserService.getAllList(null, null, userIds);
} else { } else {
userList = adminUserService.getAllList(CommonStatusEnum.ENABLE.getStatus(), null, dto.getTargetIds()); userList = adminUserService.getAllList(null, null, dto.getTargetIds());
} }
// -- 统计 // -- 统计