guzijian / bsth-alcohol-sign · Commits

Commit ef365cc9806fd80129ded5d163a62eebe49fd005

Authored by guzijian
1 parent 2c127940

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

Inline Side-by-side
Showing 2 changed files with 3 additions and 3 deletions
Bsth-admin/src/main/java/com/ruoyi/service/impl/AttendanceServiceImpl.java
  View file @ef365cc
@@ -391,7 +391,7 @@ public class AttendanceServiceImpl implements AttendanceService { @@ -391,7 +391,7 @@ public class AttendanceServiceImpl implements AttendanceService {
391 // 匹配当天应设置的规则 391 // 匹配当天应设置的规则
392 RuleSchedulingDto dto = getNowRuleByFixed(nowDate, startDate, ruleSchedulingDtoList); 392 RuleSchedulingDto dto = getNowRuleByFixed(nowDate, startDate, ruleSchedulingDtoList);
393 main.setWorkFlag(dto.getId() == 0 ? FREE_FLAG : WORK_FLAG); 393 main.setWorkFlag(dto.getId() == 0 ? FREE_FLAG : WORK_FLAG);
394 - BeanUtils.copyProperties(dto, main); 394 + BeanUtils.copyProperties(dto, main,"secondWorkSignInTime","secondSignInWorkingRange","secondQuittingSignInTime","secondSignInQuittingRange","secondSignDayTomorrow");
395 main.setName(attendanceDto.getName()); 395 main.setName(attendanceDto.getName());
396 main.setJobCode(attendanceDto.getJobCode()); 396 main.setJobCode(attendanceDto.getJobCode());
397 // 处理是否分段 397 // 处理是否分段
Bsth-admin/src/main/java/com/ruoyi/service/impl/RuleNumSettingServiceImpl.java
  View file @ef365cc
@@ -152,7 +152,7 @@ public class RuleNumSettingServiceImpl extends ServiceImpl<RuleNumSettingMapper, @@ -152,7 +152,7 @@ public class RuleNumSettingServiceImpl extends ServiceImpl<RuleNumSettingMapper,
152 RuleSchedulingDto dto = null; 152 RuleSchedulingDto dto = null;
153 dto = getRuleByWeek(main, ruleSchedulingDtoList, date, attendanceDto.getStartDate()); 153 dto = getRuleByWeek(main, ruleSchedulingDtoList, date, attendanceDto.getStartDate());
154 main.setWorkFlag(dto.getId() == 0 ? FREE_FLAG : WORK_FLAG); 154 main.setWorkFlag(dto.getId() == 0 ? FREE_FLAG : WORK_FLAG);
155 - BeanUtils.copyProperties(dto, main); 155 + BeanUtils.copyProperties(dto, main,"secondWorkSignInTime","secondSignInWorkingRange","secondQuittingSignInTime","secondSignInQuittingRange","secondSignDayTomorrow");
156 main.setName(attendanceDto.getName()); 156 main.setName(attendanceDto.getName());
157 main.setJobCode(attendanceDto.getJobCode()); 157 main.setJobCode(attendanceDto.getJobCode());
158 handleSegmentationByDate(date, main, dto); 158 handleSegmentationByDate(date, main, dto);
@@ -224,7 +224,7 @@ public class RuleNumSettingServiceImpl extends ServiceImpl<RuleNumSettingMapper, @@ -224,7 +224,7 @@ public class RuleNumSettingServiceImpl extends ServiceImpl<RuleNumSettingMapper,
224 // 匹配当天应设置的规则 224 // 匹配当天应设置的规则
225 RuleSchedulingDto dto = getNowRuleByFixed(nowDate, startDate, ruleSchedulingDtoList); 225 RuleSchedulingDto dto = getNowRuleByFixed(nowDate, startDate, ruleSchedulingDtoList);
226 main.setWorkFlag(dto.getId() == 0 ? FREE_FLAG : WORK_FLAG); 226 main.setWorkFlag(dto.getId() == 0 ? FREE_FLAG : WORK_FLAG);
227 - BeanUtils.copyProperties(dto, main); 227 + BeanUtils.copyProperties(dto, main,"secondWorkSignInTime","secondSignInWorkingRange","secondQuittingSignInTime","secondSignInQuittingRange","secondSignDayTomorrow");
228 main.setName(attendanceDto.getName()); 228 main.setName(attendanceDto.getName());
229 main.setJobCode(attendanceDto.getJobCode()); 229 main.setJobCode(attendanceDto.getJobCode());
230 // 处理是否分段 230 // 处理是否分段