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

修复社保福利档案补缴添加bug

This commit is contained in:
Harryxzy 2024-09-18 16:44:02 +08:00
parent c4826515e1
commit 58012fe1e1
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -172,7 +172,9 @@ public class SIBalanceServiceImpl extends Service implements SIBalanceService {
Map<String, String> socialComMap = JSON.parseObject(socialSchemePO.getSocialPaymentComBaseString(), new HashMap<String, String>().getClass());
List<String> socialIds = new ArrayList<>();
socialIds.addAll(socialMap.keySet());
socialIds.addAll(socialComMap.keySet());
if (socialComMap != null) {
socialIds.addAll(socialComMap.keySet());
}
socialIds = socialIds.stream().distinct().collect(Collectors.toList());
//查询该福利方案下开启缴纳的福利项
List<String> insuranceIdAndScopeList = payInsuranceIdAndScopeList(socialSchemePO.getSocialSchemeId());
@ -213,7 +215,9 @@ public class SIBalanceServiceImpl extends Service implements SIBalanceService {
Map<String, String> fundComMap = JSON.parseObject(fundSchemePO.getFundPaymentComBaseString(), new HashMap<String, String>().getClass());
List<String> fundIds = new ArrayList<>();
fundIds.addAll(fundMap.keySet());
fundIds.addAll(fundComMap.keySet());
if (fundComMap != null) {
fundIds.addAll(fundComMap.keySet());
}
fundIds = fundIds.stream().distinct().collect(Collectors.toList());
//查询该福利方案下开启缴纳的福利项
List<String> insuranceIdAndScopeList = payInsuranceIdAndScopeList(fundSchemePO.getFundSchemeId());
@ -254,7 +258,9 @@ public class SIBalanceServiceImpl extends Service implements SIBalanceService {
Map<String, String> otherComMap = JSON.parseObject(otherSchemePO.getOtherPaymentComBaseString(), new HashMap<String, String>().getClass());
List<String> otherIds = new ArrayList<>();
otherIds.addAll(otherMap.keySet());
otherIds.addAll(otherComMap.keySet());
if (otherComMap != null) {
otherIds.addAll(otherComMap.keySet());
}
otherIds = otherIds.stream().distinct().collect(Collectors.toList());
//查询该福利方案下开启缴纳的福利项
List<String> insuranceIdAndScopeList = payInsuranceIdAndScopeList(otherSchemePO.getOtherSchemeId());