From eb033d64fdc460f8c8cb572f893f6cb6f2d3a5ba Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Mon, 19 Sep 2022 14:14:17 +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=E8=A1=A5=E7=BC=B4=E9=A1=B5?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A1=A5=E7=BC=B4=E6=95=B0=E6=8D=AE=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=A0=A1=E9=AA=8C=E6=95=B0=E6=8D=AE=E5=BA=93=E4=B8=AD?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=B7=B2=E6=9C=89=E8=AF=A5=E7=BB=84=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E7=9A=84=E8=A1=A5=E7=BC=B4=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/biz/SIAccountBiz.java       |  5 +++++
 .../siaccount/InsuranceAccountDetailMapper.java   | 10 ++++++++++
 .../siaccount/InsuranceAccountDetailMapper.xml    | 15 +++++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java
index b3b13015c..7a9939a05 100644
--- a/src/com/engine/salary/biz/SIAccountBiz.java
+++ b/src/com/engine/salary/biz/SIAccountBiz.java
@@ -904,6 +904,11 @@ public class SIAccountBiz extends Service {
         //核算结果集
         List<InsuranceAccountDetailPO> pos = new ArrayList<>();
         baseList.forEach(baseParam -> {
+            //判断人员id+账单月份+补缴月份在表中的唯一性
+            List<InsuranceAccountDetailPO> supplementList = getInsuranceAccountDetailMapper().querySupplementList(baseParam.getBillMonth(), baseParam.getPaymentOrganization(), baseParam.getEmployeeId(), baseParam.getSupplementaryMonth());
+            if (supplementList.size() > 0) {
+                throw new SalaryRunTimeException("当前人员和账单月份已存在该补缴月份的数据！无法再次创建！");
+            }
             InsuranceAccountDetailPO insuranceAccountDetailPO = accountSingleEmployeeBill(baseParam, longInsuranceArchivesAccountPOMap.get(baseParam.getEmployeeId()), employeeId);
             pos.add(insuranceAccountDetailPO);
         });
diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java
index a75581cf9..d7c8ffa63 100644
--- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java
+++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java
@@ -72,6 +72,16 @@ public interface InsuranceAccountDetailMapper {
 
     List<InsuranceAccountDetailPO> queryList(@Param("billMonth") String billMonth, @Param("paymentOrganization") Long paymentOrganization, @Param("employeeIds") Collection<Long> employeeIds);
 
+    /**
+     * 查询补缴数据
+     * @param billMonth
+     * @param paymentOrganization
+     * @param employeeId
+     * @param supplementaryMonth
+     * @return
+     */
+    List<InsuranceAccountDetailPO> querySupplementList(@Param("billMonth") String billMonth, @Param("paymentOrganization") Long paymentOrganization, @Param("employeeId") Long employeeId, @Param("supplementaryMonth") String supplementaryMonth);
+
 
     /**
      * 根据账单月份删除
diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
index e41efcd8d..09c8d58b8 100644
--- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
+++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
@@ -188,6 +188,21 @@
         </if>
     </select>
 
+    <select id="querySupplementList" resultMap="BaseResultMap">
+        SELECT
+        t.employee_id,t.social_per_json,t.social_com_json,
+        t.fund_per_json,t.fund_com_json,t.other_per_json,
+        t.other_com_json,t.social_per_sum,t.social_com_sum,
+        t.fund_per_sum,t.fund_com_sum,t.other_per_sum,
+        t.other_com_sum,t.per_sum,t.com_sum
+        FROM
+        hrsa_bill_detail t
+        WHERE t.delete_type = 0
+        AND t.bill_month = #{billMonth}
+        AND t.payment_organization = #{paymentOrganization}
+        AND t.employee_id = #{employeeId}
+        AND t.supplementary_month = #{supplementaryMonth}
+    </select>
 
     <select id="selectAccountIds" resultType="java.lang.Long">
         SELECT DISTINCT a.ID