Commit 2c127940ec66b88ed8bcd67b10c6bdebb00e8e8c

Authored by guzijian
1 parent 9ab1aedd

fix: 修复不分段规则由于有值导致生成错误问题

Bsth-admin/src/main/java/com/ruoyi/service/impl/AttendanceServiceImpl.java
@@ -447,7 +447,7 @@ public class AttendanceServiceImpl implements AttendanceService { @@ -447,7 +447,7 @@ public class AttendanceServiceImpl implements AttendanceService {
447 RuleSchedulingDto dto = null; 447 RuleSchedulingDto dto = null;
448 dto = getRuleByWeek(main, ruleSchedulingDtoList, date, attendanceDto.getStartDate()); 448 dto = getRuleByWeek(main, ruleSchedulingDtoList, date, attendanceDto.getStartDate());
449 main.setWorkFlag(dto.getId() == 0 ? FREE_FLAG : WORK_FLAG); 449 main.setWorkFlag(dto.getId() == 0 ? FREE_FLAG : WORK_FLAG);
450 - BeanUtils.copyProperties(dto, main); 450 + BeanUtils.copyProperties(dto, main,"secondWorkSignInTime","secondSignInWorkingRange","secondQuittingSignInTime","secondSignInQuittingRange","secondSignDayTomorrow");
451 main.setName(attendanceDto.getName()); 451 main.setName(attendanceDto.getName());
452 main.setJobCode(attendanceDto.getJobCode()); 452 main.setJobCode(attendanceDto.getJobCode());
453 handleSegmentationByDate(date, main, dto); 453 handleSegmentationByDate(date, main, dto);