admin 结算修改i
This commit is contained in:
parent
b1da4d5ef5
commit
b85546df27
@ -229,11 +229,17 @@ public class AdminSalarySettlementServiceImpl implements AdminSalarySettlementSe
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
BigDecimal teamSalary = teamSummary.getBdLeaderTeams().getTotalIncome();
|
BigDecimal bdLeaderTeamSalary = teamSummary.getBdLeaderTeams().getTotalIncome();
|
||||||
if (teamSalary == null) {
|
if (bdLeaderTeamSalary == null) {
|
||||||
teamSalary = BigDecimal.ZERO;
|
bdLeaderTeamSalary = BigDecimal.ZERO;
|
||||||
}
|
}
|
||||||
record.setBdLeaderTeamSalary(teamSalary.setScale(2, RoundingMode.DOWN));
|
BigDecimal bdTeamSalary = teamSummary.getBdTeams().getTotalIncome();
|
||||||
|
if (bdTeamSalary == null) {
|
||||||
|
bdTeamSalary = BigDecimal.ZERO;
|
||||||
|
}
|
||||||
|
|
||||||
|
BigDecimal teamSalary = bdLeaderTeamSalary.add(bdTeamSalary).setScale(2, RoundingMode.DOWN);
|
||||||
|
record.setBdLeaderTeamSalary(teamSalary);
|
||||||
|
|
||||||
// 查询 BD_LEADER 政策
|
// 查询 BD_LEADER 政策
|
||||||
List<AdminSalaryPolicy> policies = adminSalaryPolicyService.listEnabledByType(
|
List<AdminSalaryPolicy> policies = adminSalaryPolicyService.listEnabledByType(
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user