From 0045a0dd59ff66d44bdd4e89fdc8e5a6a2373ec1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Wed, 21 Sep 2022 11:12:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=8F=E5=88=A9=E7=9A=84=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E6=A0=B8=E7=AE=97=E5=8A=9F=E8=83=BD=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/service/impl/SIAccountServiceImpl.java     | 11 ++++++-----
 .../service/impl/SalaryArchiveItemServiceImpl.java    |  3 +++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
index 596b8c86b..ec1b2813d 100644
--- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
@@ -987,11 +987,12 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
 
     @Override
     public void socialSecurityBenefitsRecalculate(InsuranceAccountBatchPO param) {
-        int num = getSiAccountBiz(user).checkIfBusinessaccounting(param);
-        //表示已经被核算过不能重新核算
-        if (num > 0) {
-            throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98831, "已被薪酬核算给核算过，无法重新核算！"));
-        }
+        //fixme 重新核算的校验逻辑  1、先取台账对应扣缴义务人下的所有账套 2、取账套下所有核算记录 3、判断核算记录有没有使用对应月份的福利台账
+//        int num = getSiAccountBiz(user).checkIfBusinessaccounting(param);
+//        //表示已经被核算过不能重新核算
+//        if (num > 0) {
+//            throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98831, "已被薪酬核算给核算过，无法重新核算！"));
+//        }
         param.setBillStatus(0);
         getSiAccountBiz(user).updateById(param);
     }
diff --git a/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java
index 31906e437..64b0e02bf 100644
--- a/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java
@@ -127,6 +127,9 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi
             throw new SalaryRunTimeException("薪资档案不存在！");
         }
 
+
+
+
         // 获取当前已生效数据
         List<SalaryArchiveItemPO> effectiveSalaryItems = getEffectiveSalaryItems(salaryArchiveId, salaryItemIds);