diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index ba60f266c..fcf98d858 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -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")); diff --git a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java index 00ec16c42..7b50af88b 100644 --- a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java @@ -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 iCategoryMap = SalaryEntityUtil.convert2Map(getICategoryMapper().listAll(), ICategoryPO::getId, ICategoryPO::getInsuranceName); List infoList = new ArrayList<>(); if (socialArchive != null && socialArchive.getSocialSchemeId() != null) { // 获取社保方案信息 List insuranceSchemeDetailList = getSISchemeService(user).queryInsuranceSchemeDetailList(socialArchive.getSocialSchemeId()).stream().collect(Collectors.toList()); Map> insuranceSchemeDetailMap = SalaryEntityUtil.group2Map(insuranceSchemeDetailList, InsuranceSchemeDetailPO::getInsuranceId); - Map iCategoryMap = SalaryEntityUtil.convert2Map(getICategoryMapper().listAll(), ICategoryPO::getId, ICategoryPO::getInsuranceName); Map socialJson = JSON.parseObject(socialArchive.getSocialPaymentBaseString(), new TypeReference>() {}); insuranceSchemeDetailMap.forEach((insuranceId, detailList) -> { Map 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()); }); }