| | |
|---|
| | | HrmSocialSecuritySchemeDO scheme, |
|---|
| | | LocalDate effectiveDate) { |
|---|
| | | // 计算应发薪资 |
|---|
| | | BigDecimal baseSalary = employeeSalary.getBaseSalary() != null ? employeeSalary.getBaseSalary() : BigDecimal.ZERO; |
|---|
| | | // 基本工资统一取「员工信息」中维护的基本薪资（薪酬档案里的 baseSalary 不再作为核算来源， |
|---|
| | | // 避免员工信息与薪酬档案不一致时，核算结果与员工档案对不上） |
|---|
| | | BigDecimal baseSalary = employee.getBaseSalary() != null ? employee.getBaseSalary() : BigDecimal.ZERO; |
|---|
| | | BigDecimal performanceSalary = employeeSalary.getPerformanceSalary() != null ? employeeSalary.getPerformanceSalary() : BigDecimal.ZERO; |
|---|
| | | BigDecimal mealAllowance = employeeSalary.getMealAllowance() != null ? employeeSalary.getMealAllowance() : BigDecimal.ZERO; |
|---|
| | | BigDecimal transportAllowance = employeeSalary.getTransportAllowance() != null ? employeeSalary.getTransportAllowance() : BigDecimal.ZERO; |
|---|
| | |
|---|
| | | calculation.setConfirmTime(exist.getConfirmTime()); |
|---|
| | | calculation.setConfirmUserId(exist.getConfirmUserId()); |
|---|
| | | calculation.setPaymentTime(exist.getPaymentTime()); |
|---|
| | | // 金额字段为 null 时统一按 0 处理：MyBatis-Plus 的 updateById 默认忽略 null， |
|---|
| | | // 否则会出现「实发工资按 0 计算、但明细仍保留旧值」的不一致 |
|---|
| | | calculation.setBaseSalary(nvl(calculation.getBaseSalary())); |
|---|
| | | calculation.setPerformanceSalary(nvl(calculation.getPerformanceSalary())); |
|---|
| | | calculation.setOvertimePay(nvl(calculation.getOvertimePay())); |
|---|
| | | calculation.setMealAllowance(nvl(calculation.getMealAllowance())); |
|---|
| | | calculation.setTransportAllowance(nvl(calculation.getTransportAllowance())); |
|---|
| | | calculation.setOtherAllowance(nvl(calculation.getOtherAllowance())); |
|---|
| | | calculation.setSocialSecurityDeduction(nvl(calculation.getSocialSecurityDeduction())); |
|---|
| | | calculation.setHousingFundDeduction(nvl(calculation.getHousingFundDeduction())); |
|---|
| | | calculation.setTaxDeduction(nvl(calculation.getTaxDeduction())); |
|---|
| | | calculation.setOtherDeduction(nvl(calculation.getOtherDeduction())); |
|---|
| | | calculation.setLeaveDeduction(nvl(calculation.getLeaveDeduction())); |
|---|
| | | // 实发工资由后端重算，避免前端传入值与明细不一致 |
|---|
| | | calculation.setActualSalary(calcActualSalary(calculation)); |
|---|
| | | salaryCalculationMapper.updateById(calculation); |
|---|
