From 8a0e72f99cdfe06d692be0cbcc8fde64b815f810 Mon Sep 17 00:00:00 2001 From: sy Date: Fri, 14 Oct 2022 16:34:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-=E7=A6=8F?= =?UTF-8?q?=E5=88=A9=E6=A1=A3=E6=A1=88=E7=BB=93=E6=9E=84=E6=94=B9=E9=80=A0?= =?UTF-8?q?=EF=BC=8C=E6=A1=A3=E6=A1=88=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/biz/SIArchivesBiz.java | 1 + .../po/InsuranceArchivesEmployeePO.java | 2 + .../mapper/siarchives/SocialSchemeMapper.xml | 2 +- .../salary/service/SIArchivesService.java | 15 ++ .../service/impl/SIArchivesServiceImpl.java | 175 +++++++++++++++++- .../salary/web/SIArchivesController.java | 35 +++- 6 files changed, 224 insertions(+), 6 deletions(-) diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java index c1465195a..6bc2deed5 100644 --- a/src/com/engine/salary/biz/SIArchivesBiz.java +++ b/src/com/engine/salary/biz/SIArchivesBiz.java @@ -981,6 +981,7 @@ public class SIArchivesBiz { map.put("fundSchemeId", item.getFundSchemeId()); map.put("otherSchemeId", item.getOtherSchemeId()); map.put("status", item.getUserStatus() != null ? UserStatusEnum.values()[item.getUserStatus()].getDefaultLabel() : ""); + map.put("baseInfo", item.getBaseInfoId()); if (socialItem != null) { map.put("socialName", insuranceSchemeMapper.querySchemeName(socialItem.getSocialSchemeId())); Map socialJson = JSON.parseObject(socialItem.getSocialPaymentBaseString(), new TypeReference>() { diff --git a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesEmployeePO.java b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesEmployeePO.java index 29e3b6a51..170e41bde 100644 --- a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesEmployeePO.java +++ b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesEmployeePO.java @@ -51,4 +51,6 @@ public class InsuranceArchivesEmployeePO { private Long fundSchemeId; private Long otherSchemeId; + + private Long baseInfoId; } diff --git a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml index 081169a8d..e015b6331 100644 --- a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml +++ b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml @@ -306,7 +306,7 @@