qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

薪酬系统-福利台账，补差导入部分福利项缴费信息相关合计逻辑优化

This commit is contained in:
sy 2023-04-23 18:05:32 +08:00
parent 37310f02f6
commit c686f52153
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/engine/salary/service/impl/SIAccountServiceImpl.java
View File

@ -1704,19 +1704,19 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
if (!StringUtils.isEmpty(baseMap.getOrDefault("社保个人合计", "").toString())) {
insuranceAccountDetailPO.setSocialPerSum(baseMap.get("社保个人合计").toString());
} else {
} else if (!socialPerMap.isEmpty()) {
insuranceAccountDetailPO.setSocialPerSum(sumOfMapValue(socialPerMap));
}
if (!StringUtils.isEmpty(baseMap.getOrDefault("公积金个人合计", "").toString())) {
insuranceAccountDetailPO.setFundPerSum(baseMap.get("公积金个人合计").toString());
} else {
} else if (!fundPerMap.isEmpty()) {
insuranceAccountDetailPO.setFundPerSum(sumOfMapValue(fundPerMap));
}
if (!StringUtils.isEmpty(baseMap.getOrDefault("其他福利个人合计", "").toString())) {
insuranceAccountDetailPO.setOtherPerSum(baseMap.get("其他福利个人合计").toString());
} else {
} else if (!otherPerMap.isEmpty()) {
insuranceAccountDetailPO.setOtherPerSum(sumOfMapValue(otherPerMap));
}
@ -1730,19 +1730,19 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
if (!StringUtils.isEmpty(baseMap.getOrDefault("社保单位合计", "").toString())) {
insuranceAccountDetailPO.setSocialComSum(baseMap.get("社保单位合计").toString());
} else {
} else if (!socialComMap.isEmpty()) {
insuranceAccountDetailPO.setSocialComSum(sumOfMapValue(socialComMap));
}
if (!StringUtils.isEmpty(baseMap.getOrDefault("公积金单位合计", "").toString())) {
insuranceAccountDetailPO.setFundComSum(baseMap.get("公积金单位合计").toString());
} else {
} else if (!fundComMap.isEmpty()) {
insuranceAccountDetailPO.setFundComSum(sumOfMapValue(fundComMap));
}
if (!StringUtils.isEmpty(baseMap.getOrDefault("其他福利单位合计", "").toString())) {
insuranceAccountDetailPO.setOtherComSum(baseMap.get("其他福利单位合计").toString());
} else {
} else if (!otherComMap.isEmpty()) {
insuranceAccountDetailPO.setOtherComSum(sumOfMapValue(otherComMap));
}