|
|
@@ -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); |
|
|
|
// 剩余天数 |