fix: 全面修复由于规则数据引发导致的日期问题

guzijian
1 parent 957edd3f
Showing 1 changed file with 2 additions and 2 deletions
Bsth-admin/src/main/java/com/ruoyi/service/impl/AttendanceServiceImpl.java
@@ -180,7 +180,7 @@ public class AttendanceServiceImpl implements AttendanceService {
     public void updateAttendance(UpdateAttendanceVo vo) {
         RuleAttendanceMain main = new RuleAttendanceMain();
         RuleScheduling ruleScheduling = ruleSchedulingService.selectRuleSchedulingById(vo.getRuleId().longValue());
-        BeanUtils.copyProperties(ruleScheduling, main);
+        BeanUtils.copyProperties(ruleScheduling, main,"secondWorkSignInTime","secondSignInWorkingRange","secondQuittingSignInTime","secondSignInQuittingRange","secondSignDayTomorrow");
         List<RuleAttendanceMain> mainList = handleRuleUpdate(vo, main, ruleScheduling);
         attendanceMainService.updateByJobCodeTotalQuantity(vo, mainList);
     }
@@ -581,7 +581,7 @@ public class AttendanceServiceImpl implements AttendanceService {
         RuleSchedulingDto dto = new RuleSchedulingDto();
         BeanUtils.copyProperties(ruleScheduling, dto);
  
-        BeanUtils.copyProperties(dto, otherMain);
+        BeanUtils.copyProperties(dto, otherMain,"secondWorkSignInTime","secondSignInWorkingRange","secondQuittingSignInTime","secondSignInQuittingRange","secondSignDayTomorrow");
         RuleNumSettingServiceImpl.handleSegmentationByDate(LocalDate.parse(date), otherMain, dto);
         otherMain.setWorkFlag(dto.getId() == 0 ? FREE_FLAG : WORK_FLAG);
     }