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

1

Browse Source
This commit is contained in:
dy 2025-08-06 16:47:46 +08:00
parent 5a92f9032e
commit 66721b34cd
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,9 +67,7 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS
//将排班人员信息添加到排班信息中 //将排班人员信息添加到排班信息中
AttendanceArrangementVo vo = baseMapper.selectVoById(id); AttendanceArrangementVo vo = baseMapper.selectVoById(id);
vo.setUserGroupList(userGroupList); vo.setUserGroupList(userGroupList);
return vo;
return baseMapper.selectVoById(id);
} }
/** /**
@ -318,8 +316,6 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS
// // 2. 根据日历的开始时间和结束时间查询出每一天的排班信息 // // 2. 根据日历的开始时间和结束时间查询出每一天的排班信息
// // 2.1 循环日历的开始时间和结束时间，判断 calendarStartDate 在哪些排班中 // // 2.1 循环日历的开始时间和结束时间，判断 calendarStartDate 在哪些排班中
// List<AttendanceArrangementVo> result = new ArrayList<>(); // List<AttendanceArrangementVo> result = new ArrayList<>();
//
//
// //查询所有排班信息 // //查询所有排班信息
// List<AttendanceArrangement> arrangementList1 = baseMapper.selectList(); // List<AttendanceArrangement> arrangementList1 = baseMapper.selectList();
// //取出排班的开始时间和结束时间 // //取出排班的开始时间和结束时间
@ -335,25 +331,16 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS
// if (count >= startDateList.size() || count >= endDateList.size()){ // if (count >= startDateList.size() || count >= endDateList.size()){
// continue; // continue;
// } // }
//
//
//
//// // 查询指定日期在哪些排班中 //// // 查询指定日期在哪些排班中
//// List<AttendanceArrangement> arrangementList = baseMapper.selectList( //// List<AttendanceArrangement> arrangementList = baseMapper.selectList(
//// Wrappers.<AttendanceArrangement>lambdaQuery() //// Wrappers.<AttendanceArrangement>lambdaQuery()
//// .between(AttendanceArrangement::getStartDate, date.atStartOfDay(ZoneId.systemDefault()).toInstant(), //// .between(AttendanceArrangement::getStartDate, date.atStartOfDay(ZoneId.systemDefault()).toInstant(),
//// date.atStartOfDay(ZoneId.systemDefault()).plusDays(1).toInstant().minusSeconds(1))); //// date.atStartOfDay(ZoneId.systemDefault()).plusDays(1).toInstant().minusSeconds(1)));
//
//
// // 查询指定日期在哪些排班中 // // 查询指定日期在哪些排班中
// List<AttendanceArrangement> arrangementList = baseMapper.selectList( // List<AttendanceArrangement> arrangementList = baseMapper.selectList(
// Wrappers.<AttendanceArrangement>lambdaQuery() // Wrappers.<AttendanceArrangement>lambdaQuery()
// .between(AttendanceArrangement::getStartDate, startDateList.get(count).atStartOfDay(ZoneId.systemDefault()).toInstant(), // .between(AttendanceArrangement::getStartDate, startDateList.get(count).atStartOfDay(ZoneId.systemDefault()).toInstant(),
// endDateList.get(count).atStartOfDay(ZoneId.systemDefault()).plusDays(1).toInstant().minusSeconds(1))); // endDateList.get(count).atStartOfDay(ZoneId.systemDefault()).plusDays(1).toInstant().minusSeconds(1)));
//
//
//
//
//// //根据arrangementList查询出排班的id //// //根据arrangementList查询出排班的id
//// List<Long> scheduleIdList = arrangementList.stream().map(AttendanceArrangement::getId).toList(); //// List<Long> scheduleIdList = arrangementList.stream().map(AttendanceArrangement::getId).toList();
//// //根据排班的id查询出排班的人员详细信息 //// //根据排班的id查询出排班的人员详细信息
@ -407,7 +394,6 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS
// count++; // count++;
// } // }
return TableDataInfo.build(result); return TableDataInfo.build(result);
} }
@ -511,6 +497,10 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS
*/ */
private void validEntityBeforeSave(AttendanceArrangement entity) { private void validEntityBeforeSave(AttendanceArrangement entity) {
//TODO 做一些数据校验,如唯一约束 //TODO 做一些数据校验,如唯一约束
//新增时判断在该时间段内是否有排班
} }
/** /**