From 955f8c255eaa2d9280edb1d29e110bdc3c568546 Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Mon, 21 Nov 2022 16:25:26 +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=E5=8F=B0=E8=B4=A6=EF=BC=8C=E9=80=80=E5=B7=AE=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=96=B0=E5=A2=9Ev2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/service/impl/SIRecessionServiceImpl.java   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/com/engine/salary/service/impl/SIRecessionServiceImpl.java b/src/com/engine/salary/service/impl/SIRecessionServiceImpl.java
index 2907085e7..b79df634b 100644
--- a/src/com/engine/salary/service/impl/SIRecessionServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIRecessionServiceImpl.java
@@ -68,6 +68,7 @@ public class SIRecessionServiceImpl extends Service implements SIRecessionServic
             employeeIds = employeeIds.stream().filter(item -> !param.getExcludes().contains(item)).collect(Collectors.toList());
         }
         SalaryAssert.notEmpty(employeeIds, SalaryI18nUtil.getI18nLabel(133967, "无退差人员"));
+
         //查询退差员工对应的退差月份的正常缴纳的福利台账数据
         List<InsuranceAccountDetailPO> detailPOS= getInsuranceAccountDetailMapper().list(InsuranceAccountDetailParam.builder()
                 .paymentStatus(PaymentStatusEnum.COMMON.getValue())
@@ -89,6 +90,16 @@ public class SIRecessionServiceImpl extends Service implements SIRecessionServic
         });
         //退差数据入库
         if (CollectionUtils.isNotEmpty(finalRecessionDetails)) {
+
+            //
+            //查询退差员工中是否已经进行有过退差记录,有过则更新
+//            List<InsuranceAccountDetailPO> haveRecessionPOS= getInsuranceAccountDetailMapper().list(InsuranceAccountDetailParam.builder()
+//                    .paymentStatus(PaymentStatusEnum.RECESSION.getValue())
+//                    .recessionMonthList(param.getRecessionMonthList())
+//                    .employeeIds(employeeIds)
+//                    .paymentOrganization(param.getPaymentOrganization())
+//                    .build());
+            //
             InsuranceAccountDetailPOEncrypt.encryptInsuranceAccountDetailPOList(finalRecessionDetails);
 
             List<List<InsuranceAccountDetailPO>> partition = Lists.partition((List<InsuranceAccountDetailPO>) finalRecessionDetails, 20);