From 15477cc8d5e50e35e1b39fb5aad0f81a8f9aa422 Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Mon, 21 Nov 2022 17:52:28 +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=9Ev3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../siaccount/InsuranceAccountDetailMapper.java    |  6 ++++++
 .../siaccount/InsuranceAccountDetailMapper.xml     | 11 +++++++++++
 .../service/impl/SIRecessionServiceImpl.java       | 14 ++++----------
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java
index 25f1ed64b..030d68d5f 100644
--- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java
+++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java
@@ -162,4 +162,10 @@ public interface InsuranceAccountDetailMapper {
      * 根据id更新数据
      */
     void updateById(InsuranceAccountDetailPO po);
+
+
+    /**
+     * 删除退差数据(账单月份+退差月份+缴纳状态+人员id+个税扣缴义务人)
+     */
+    void deleteRecessionData(InsuranceAccountDetailPO po);
 }
diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
index 5f2bce3dd..dbe702558 100644
--- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
+++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
@@ -1184,4 +1184,15 @@
         </set>
         WHERE id = #{id}
     </update>
+
+    <delete id="deleteRecessionData" parameterType="com.engine.salary.entity.siaccount.po.InsuranceAccountDetailPO">
+        DELETE
+        FROM hrsa_bill_detail
+        WHERE delete_type = 0
+        AND bill_month = #{billMonth}
+        AND payment_status = #{paymentStatus}
+        AND payment_organization = #{paymentOrganization}
+        AND supplementary_month = #{supplementaryMonth}
+        AND employee_id = #{employeeId}
+    </delete>
 </mapper>
\ No newline at end of file
diff --git a/src/com/engine/salary/service/impl/SIRecessionServiceImpl.java b/src/com/engine/salary/service/impl/SIRecessionServiceImpl.java
index b79df634b..0c819b984 100644
--- a/src/com/engine/salary/service/impl/SIRecessionServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIRecessionServiceImpl.java
@@ -90,18 +90,12 @@ 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);
 
+            //删除已有退差记录
+            finalRecessionDetails.forEach(getInsuranceAccountDetailMapper()::deleteRecessionData);
+
+            //入库新数据
             List<List<InsuranceAccountDetailPO>> partition = Lists.partition((List<InsuranceAccountDetailPO>) finalRecessionDetails, 20);
             partition.forEach(getInsuranceAccountDetailMapper()::batchSaveAccountDetails);