From 6cb2b2e6776d3e9bfd760efc4dafe8194dd25bdc Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Fri, 14 Feb 2025 16:47:20 +0800
Subject: [PATCH] =?UTF-8?q?=E9=92=B1=E6=99=BA=20=E7=A4=BE=E4=BF=9D?=
 =?UTF-8?q?=E6=A0=B8=E7=AE=97=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/salary/service/impl/SIAccountServiceImpl.java    | 6 +++---
 .../engine/salary/service/impl/SIArchivesServiceImpl.java   | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

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<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());
             });
         }