Browse Source

修改年末时间为当前时间

main
1341924763@qq.com 5 days ago
parent
commit
547718091a

+ 5
- 2
zs-manager/src/main/java/com/ruoyi/zhushi/service/impl/NjBalanceManageServiceImpl.java View File

@@ -135,8 +135,9 @@ public class NjBalanceManageServiceImpl implements NjBalanceManageService {
if(annualLeaveTiers == Constans.ANNUALLEAVETIERS_0){
// 获取入职当年的最后一天
LocalDate lastDayOfYear = joinedDate.withDayOfMonth(31).withMonth(12);
LocalDate now = LocalDate.now();
// 计算从入职日期(不含)到年底(含)的天数差
long remainingDay = ChronoUnit.DAYS.between(joinedDate, lastDayOfYear) + 1;
long remainingDay = ChronoUnit.DAYS.between(joinedDate, now) + 1;
BigDecimal annualLeave = BigDecimal.valueOf(remainingDay).divide(BigDecimal.valueOf(365), 1, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(5));
njBalanceManage.setAnnualLeave(annualLeave);
// 剩余天数
@@ -239,8 +240,10 @@ public class NjBalanceManageServiceImpl implements NjBalanceManageService {
if(annualLeaveTiers == Constans.ANNUALLEAVETIERS_0){
// 获取入职当年的最后一天
LocalDate lastDayOfYear = joinedDate.withDayOfMonth(31).withMonth(12);
LocalDate now = LocalDate.now();

// 计算从入职日期(不含)到年底(含)的天数差
long remainingDay = ChronoUnit.DAYS.between(joinedDate, lastDayOfYear) + 1;
long remainingDay = ChronoUnit.DAYS.between(joinedDate, now) + 1;
BigDecimal annualLeave = BigDecimal.valueOf(remainingDay).divide(BigDecimal.valueOf(365), 1, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(5));
njBalanceManage.setAnnualLeave(annualLeave);
// 剩余天数

Loading…
Cancel
Save