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

钱智 社保核算需求变更

This commit is contained in:
Harryxzy 2025-02-14 16:47:20 +08:00
parent 27d0f2f452
commit 6cb2b2e677
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5902,9 +5902,9 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost));
}
if (ufTsrysjsbfldaPO != null && ufTsrysjsbfldaPO.getGrbl() == null && ufTsrysjsbfldaPO.getGrgdz() != null) {
// 个人固定值
specialSocialJsonMap.put(String.valueOf(e), ufTsrysjsbfldaPO.getGrgdz().toString());
if (ufTsrysjsbfldaPO != null && ufTsrysjsbfldaPO.getDybl() == null && ufTsrysjsbfldaPO.getDwgdz() != null) {
// 单位固定值
specialSocialJsonMap.put(String.valueOf(e), ufTsrysjsbfldaPO.getDwgdz().toString());
}
if (ufTsrysjsbfldaPO != null && ufTsrysjsbfldaPO.getDybl() != null && ufTsrysjsbfldaPO.getDyjs() != null && ufTsrysjsbfldaPO.getDwgdz() == null) {
BigDecimal specialProportion = ufTsrysjsbfldaPO.getDybl().divide(new BigDecimal("100"));

5
src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
View File

@ -4248,13 +4248,13 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService
InsuranceArchivesBaseInfoPO archivesBaseInfoPO = insuranceArchivesBaseInfoList.get(0);
InsuranceArchivesSocialSchemePO socialArchive = getSocialSchemeMapper().getOneById(archivesBaseInfoPO.getSocialArchivesId());
encryptUtil.decrypt(socialArchive, InsuranceArchivesSocialSchemePO.class);
Map<Long, String> iCategoryMap = SalaryEntityUtil.convert2Map(getICategoryMapper().listAll(), ICategoryPO::getId, ICategoryPO::getInsuranceName);
List<QzSocialInfoDTO> infoList = new ArrayList<>();
if (socialArchive != null && socialArchive.getSocialSchemeId() != null) {
// 获取社保方案信息
List<InsuranceSchemeDetailPO> insuranceSchemeDetailList = getSISchemeService(user).queryInsuranceSchemeDetailList(socialArchive.getSocialSchemeId()).stream().collect(Collectors.toList());
Map<Long, List<InsuranceSchemeDetailPO>> insuranceSchemeDetailMap = SalaryEntityUtil.group2Map(insuranceSchemeDetailList, InsuranceSchemeDetailPO::getInsuranceId);
Map<Long, String> iCategoryMap = SalaryEntityUtil.convert2Map(getICategoryMapper().listAll(), ICategoryPO::getId, ICategoryPO::getInsuranceName);
Map<String, Object> socialJson = JSON.parseObject(socialArchive.getSocialPaymentBaseString(), new TypeReference<Map<String, Object>>() {});
insuranceSchemeDetailMap.forEach((insuranceId, detailList) -> {
Map<Integer, String> paymentProportionMap = SalaryEntityUtil.convert2Map(detailList, detail -> detail.getPaymentScope(), detail -> detail.getPaymentProportion());
@ -4297,9 +4297,10 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService
BigDecimal paymentBase = NumberUtils.isCreatable(paymentBaseStr) ? new BigDecimal(paymentBaseStr) : null;
infoList.add(QzSocialInfoDTO.builder()
.insuranceId(insuranceId)
.insuranceName(iCategoryMap.getOrDefault(insuranceId, ""))
.paymentBase(paymentBase)
.paymentProportion(paymentProportion)
.paymentProportion(paymentProportionCom)
.comPaymentProportion(paymentProportionCom)
.build());
});
}