From 681c0fb18eeaadc8d4d5345503db1fc3386976c9 Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Mon, 8 Jan 2024 10:57:55 +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=EF=BC=8C=E6=A1=A3=E6=A1=88=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E4=B8=AD=E6=9B=B4=E6=96=B0=E6=A1=A3=E6=A1=88=E4=B8=BB?=
 =?UTF-8?q?=E8=A1=A8=E5=92=8C=E5=AD=90=E8=A1=A8=E7=9A=84=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/biz/SIArchivesBiz.java | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java
index f2f3feee7..977adaab4 100644
--- a/src/com/engine/salary/biz/SIArchivesBiz.java
+++ b/src/com/engine/salary/biz/SIArchivesBiz.java
@@ -705,7 +705,7 @@ public class SIArchivesBiz {
 
     /**
      * @param paramReq
-     * @param employeeId
+     * @param
      */
     public void otherSave(InsuranceArchivesSaveParam paramReq, User user, boolean welBaseDiffSign) {
         long employeeId = user.getUID();
@@ -781,8 +781,9 @@ public class SIArchivesBiz {
                 if(baseInfoPO != null && baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) {
                     //对于非系统人员，编辑后状态切换为正在缴纳
                     baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue());
-                    getInsuranceBaseInfoMapper().updateById(baseInfoPO);
                 }
+                baseInfoPO.setOtherArchivesId(updateOtherInfo.getId());
+                getInsuranceBaseInfoMapper().updateById(baseInfoPO);
                 sqlSession.commit();
             } else {
                 otherSchemeMapper.deleteByEmployeeIdAndPayOrg(InsuranceArchivesOtherSchemePO.builder()
@@ -851,7 +852,7 @@ public class SIArchivesBiz {
 
     /**
      * @param paramReq
-     * @param employeeId
+     * @param
      */
     public void fundSave(InsuranceArchivesSaveParam paramReq, User user, boolean welBaseDiffSign) {
         long employeeId = user.getUID();
@@ -927,8 +928,9 @@ public class SIArchivesBiz {
                 if(baseInfoPO != null && baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) {
                     //对于非系统人员，编辑后状态切换为正在缴纳
                     baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue());
-                    getInsuranceBaseInfoMapper().updateById(baseInfoPO);
                 }
+                baseInfoPO.setFundArchivesId(updateFundInfo.getId());
+                getInsuranceBaseInfoMapper().updateById(baseInfoPO);
                 sqlSession.commit();
             } else {
                 fundSchemeMapper.deleteByEmployeeIdAndPayOrg(InsuranceArchivesFundSchemePO.builder()
@@ -1001,7 +1003,7 @@ public class SIArchivesBiz {
 
     /**
      * @param paramReq
-     * @param employeeId
+     * @param 
      */
     public void socialSave(InsuranceArchivesSaveParam paramReq, User user, boolean welBaseDiffSign) {
         long employeeId = user.getUID();
@@ -1084,8 +1086,9 @@ public class SIArchivesBiz {
                 if(baseInfoPO != null && baseInfoPO.getEmployeeType() != null && baseInfoPO.getEmployeeType().equals(DataCollectionEmployeeTypeEnum.EXT_EMPLOYEE.getValue())) {
                     //对于非系统人员，编辑后状态切换为正在缴纳
                     baseInfoPO.setRunStatus(EmployeeStatusEnum.PAYING.getValue());
-                    getInsuranceBaseInfoMapper().updateById(baseInfoPO);
                 }
+                baseInfoPO.setSocialArchivesId(updateSocialInfo.getId());
+                getInsuranceBaseInfoMapper().updateById(baseInfoPO);
                 sqlSession.commit();
             } else {
                 socialSchemeMapper.deleteByEmployeeIdAndPayOrg(InsuranceArchivesSocialSchemePO.builder()