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

新增时间的问题

Browse Source
This commit is contained in:
dy 2025-07-23 19:27:43 +08:00
parent 919d0937cd
commit 2631febd2a
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceGroupBo.java
View File

@ -59,7 +59,7 @@ public class AttendanceGroupBo extends BaseEntity {
//前端传必须打卡还是无需打卡 //前端传必须打卡还是无需打卡
private Integer mustNoCheck; private Integer mustNoCheck;
private AttendanceClockDate clockDate; private List<AttendanceClockDate> clockDate;
} }

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

@ -174,7 +174,6 @@ public class AttendanceGroupServiceImpl implements IAttendanceGroupService {
} }
); );
//todo: 法定节假日自动排休 //todo: 法定节假日自动排休
//2.3.新增打卡日期表 //2.3.新增打卡日期表
//2.3.1判断是必须打卡还是无需打卡 //2.3.1判断是必须打卡还是无需打卡
@ -217,15 +216,24 @@ public class AttendanceGroupServiceImpl implements IAttendanceGroupService {
private void judgeDate(AttendanceGroupBo bo) { private void judgeDate(AttendanceGroupBo bo) {
//3.1.1判断是时间段还是单个日期 //3.1.1判断是时间段还是单个日期
//如果为单个日期，向打卡日期表中插入数据 //如果为单个日期，向打卡日期表中插入数据
if (Objects.equals(bo.getClockDate().getDateType(), StatusConstant.SINGLEDATE)) { //循环clockDate集合
insertAttendaanceClockDate(bo); bo.getClockDate().forEach(
//设置结束时间为开始时间 clockDate -> {
bo.getClockDate().setEndDate(bo.getClockDate().getStartDate()); //向打卡日期表中插入数据
} AttendanceClockDate attendanceClockDate = new AttendanceClockDate();
//如果为时间段，向打卡日期表中插入数据 BeanUtils.copyProperties(clockDate, attendanceClockDate);
else if (Objects.equals(bo.getClockDate().getDateType(), StatusConstant.DATERANGE)) { attendanceClockDate.setGroupId(bo.getId());
insertAttendaanceClockDate(bo); attendanceClockDate.setStartDate(clockDate.getStartDate());
} //判断是时间段还是单个日期
if (Objects.equals(clockDate.getDateType(), StatusConstant.SINGLEDATE)) {
attendanceClockDate.setEndDate(clockDate.getStartDate());
} else if (Objects.equals(clockDate.getDateType(), StatusConstant.DATERANGE)) {
attendanceClockDate.setEndDate(clockDate.getEndDate());
}
attendanceClockDate.setEndDate(clockDate.getEndDate());
attendanceClockDateMapper.insert(attendanceClockDate);
}
);
} }
private void insertAttendaanceClockDate(AttendanceGroupBo bo) { private void insertAttendaanceClockDate(AttendanceGroupBo bo) {