From 3339178ac509c6e593f3d113c44a9b8aeb588993 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Wed, 5 Mar 2025 09:35:48 +0800 Subject: [PATCH] =?UTF-8?q?=E9=92=B1=E6=99=BA=20=E5=BB=BA=E6=A8=A1?= =?UTF-8?q?=E5=B8=A6=E5=87=BA=E5=9B=BA=E5=AE=9A=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/entity/siarchives/dto/QzSocialInfoDTO.java | 8 ++++++++ .../salary/service/impl/SIArchivesServiceImpl.java | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/src/com/engine/salary/entity/siarchives/dto/QzSocialInfoDTO.java b/src/com/engine/salary/entity/siarchives/dto/QzSocialInfoDTO.java index e5145ad27..3aad24afd 100644 --- a/src/com/engine/salary/entity/siarchives/dto/QzSocialInfoDTO.java +++ b/src/com/engine/salary/entity/siarchives/dto/QzSocialInfoDTO.java @@ -33,4 +33,12 @@ public class QzSocialInfoDTO { // 公司比例 private BigDecimal comPaymentProportion; + + // 个人固定 + private BigDecimal paymentFixed; + + // 公司固定 + private BigDecimal comPaymentFixed; + + } diff --git a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java index 7b50af88b..04fc3c87e 100644 --- a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java @@ -4258,12 +4258,19 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService Map socialJson = JSON.parseObject(socialArchive.getSocialPaymentBaseString(), new TypeReference>() {}); insuranceSchemeDetailMap.forEach((insuranceId, detailList) -> { Map paymentProportionMap = SalaryEntityUtil.convert2Map(detailList, detail -> detail.getPaymentScope(), detail -> detail.getPaymentProportion()); + Map paymentFixedCostMap = SalaryEntityUtil.convert2Map(detailList, detail -> detail.getPaymentScope(), detail -> detail.getFixedCost()); // 个人缴纳比例 String paymentProportionStr = paymentProportionMap.get(PaymentScopeEnum.SCOPE_PERSON.getValue()); BigDecimal paymentProportion = NumberUtils.isCreatable(paymentProportionStr) ? new BigDecimal(paymentProportionStr) : null; // 公司缴纳比例 String paymentProportionComStr = paymentProportionMap.get(PaymentScopeEnum.SCOPE_COMPANY.getValue()); BigDecimal paymentProportionCom = NumberUtils.isCreatable(paymentProportionComStr) ? new BigDecimal(paymentProportionComStr) : null; + // 个人固定 + String paymentFixedStr = paymentFixedCostMap.get(PaymentScopeEnum.SCOPE_PERSON.getValue()); + BigDecimal paymentFixed = NumberUtils.isCreatable(paymentFixedStr) ? new BigDecimal(paymentFixedStr) : null; + // 公司固定 + String paymentFixedComStr = paymentFixedCostMap.get(PaymentScopeEnum.SCOPE_COMPANY.getValue()); + BigDecimal paymentFixedCom = NumberUtils.isCreatable(paymentFixedComStr) ? new BigDecimal(paymentFixedComStr) : null; // 缴纳基数 String paymentBaseStr = socialJson.get(insuranceId.toString()) == null ? "" : socialJson.get(insuranceId.toString()).toString(); BigDecimal paymentBase = NumberUtils.isCreatable(paymentBaseStr) ? new BigDecimal(paymentBaseStr) : null; @@ -4273,6 +4280,8 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService .paymentBase(paymentBase) .paymentProportion(paymentProportion) .comPaymentProportion(paymentProportionCom) + .paymentFixed(paymentFixed) + .comPaymentFixed(paymentFixedCom) .build()); }); }