From 4875bd327c3efb123def63a79741373e11a26ac3 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Wed, 5 Feb 2025 15:52:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=A4=BE=E4=BF=9D=E7=A6=8F=E5=88=A9?=
 =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E5=8B=BE=E9=80=89=E4=BA=86=E6=9A=82=E4=B8=8D?=
 =?UTF-8?q?=E7=BC=B4=E7=BA=B3=E7=9A=84=E4=B8=8D=E5=87=BA=E7=8E=B0=E5=9C=A8?=
 =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/salary/biz/SIAccountBiz.java          |  6 +++---
 .../salary/mapper/siarchives/FundSchemeMapper.java   |  2 +-
 .../salary/mapper/siarchives/FundSchemeMapper.xml    |  1 +
 .../salary/mapper/siarchives/OtherSchemeMapper.java  |  2 +-
 .../salary/mapper/siarchives/OtherSchemeMapper.xml   |  1 +
 .../salary/mapper/siarchives/SocialSchemeMapper.java |  2 +-
 .../salary/mapper/siarchives/SocialSchemeMapper.xml  |  1 +
 .../salary/service/impl/SIAccountServiceImpl.java    | 12 ++++++------
 8 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java
index 9b2bbb180..56a1ce4b8 100644
--- a/src/com/engine/salary/biz/SIAccountBiz.java
+++ b/src/com/engine/salary/biz/SIAccountBiz.java
@@ -439,11 +439,11 @@ public class SIAccountBiz extends Service {
     public List<Long> listCanPayEmpIds(Long paymentOrganization, String billMonth) {
         List<Long> listCanPayEmpIds = new ArrayList<>();
         //社保档案中可进行缴纳的人员
-        List<Long> socialCanPayEmpIds = getSocialSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth);
+        List<Long> socialCanPayEmpIds = getSocialSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth, 0);
         //公积金档案中可进行缴纳的人员
-        List<Long> fundCanPayEmpIds = getFundSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth);
+        List<Long> fundCanPayEmpIds = getFundSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth, 0);
         //其他福利档案中可进行缴纳的人员
-        List<Long> otherCanPayEmpIds = getOtherSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth);
+        List<Long> otherCanPayEmpIds = getOtherSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth, 0);
         if (socialCanPayEmpIds != null && socialCanPayEmpIds.size() > 0) {
             listCanPayEmpIds.addAll(socialCanPayEmpIds);
         }
diff --git a/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.java b/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.java
index c7dfa1233..07396a02b 100644
--- a/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.java
+++ b/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.java
@@ -67,7 +67,7 @@ public interface FundSchemeMapper {
      * @param paymentOrganization
      * @return
      */
-    List<Long> listCanPayEmpIds(@Param("paymentOrganization")Long paymentOrganization, @Param("billMonth")String billMonth);
+    List<Long> listCanPayEmpIds(@Param("paymentOrganization")Long paymentOrganization, @Param("billMonth")String billMonth, @Param("nonPayment") Integer nonPayment);
 
     List<InsuranceArchivesFundSchemePO> listAll();
 
diff --git a/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml
index 644a21d18..8cb8fc4e0 100644
--- a/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml
+++ b/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml
@@ -266,6 +266,7 @@
         AND fund_scheme_id is not null
         AND fund_start_time is not null AND fund_start_time <![CDATA[ <= ]]> #{billMonth}
         AND (fund_end_time is null OR fund_end_time <![CDATA[ >= ]]> #{billMonth}  OR fund_end_time  ='')
+        AND non_payment = #{nonPayment}
     </select>
 
     <select id="listAll" resultMap="BaseResultMap">
diff --git a/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.java b/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.java
index fff3bbd3b..86b237085 100644
--- a/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.java
+++ b/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.java
@@ -66,7 +66,7 @@ public interface OtherSchemeMapper {
      * @param paymentOrganization
      * @return
      */
-    List<Long> listCanPayEmpIds(@Param("paymentOrganization")Long paymentOrganization, @Param("billMonth")String billMonth);
+    List<Long> listCanPayEmpIds(@Param("paymentOrganization")Long paymentOrganization, @Param("billMonth")String billMonth, @Param("nonPayment") Integer nonPayment);
 
     List<InsuranceArchivesOtherSchemePO> listAll();
 
diff --git a/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml
index ffdeb8194..7b9c59fb5 100644
--- a/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml
+++ b/src/com/engine/salary/mapper/siarchives/OtherSchemeMapper.xml
@@ -249,6 +249,7 @@
         AND other_scheme_id is not null
         AND other_start_time is not null AND other_start_time <![CDATA[ <= ]]> #{billMonth}
         AND (other_end_time is null OR other_end_time <![CDATA[ >= ]]> #{billMonth} OR other_end_time ='')
+        AND non_payment = #{nonPayment}
     </select>
 
     <select id="listAll" resultMap="BaseResultMap">
diff --git a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.java b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.java
index 246cb5c78..101546745 100644
--- a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.java
+++ b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.java
@@ -92,7 +92,7 @@ public interface SocialSchemeMapper {
      * @param paymentOrganization
      * @return
      */
-    List<Long> listCanPayEmpIds(@Param("paymentOrganization")Long paymentOrganization, @Param("billMonth")String billMonth);
+    List<Long> listCanPayEmpIds(@Param("paymentOrganization")Long paymentOrganization, @Param("billMonth")String billMonth, @Param("nonPayment")Integer nonPayment);
 
     List<InsuranceArchivesSocialSchemePO> listAll();
 
diff --git a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml
index 18823cca7..6bf5b3da9 100644
--- a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml
+++ b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml
@@ -909,6 +909,7 @@
         AND social_scheme_id is not null
         AND social_start_time is not null AND social_start_time <![CDATA[ <= ]]> #{billMonth}
         AND (social_end_time is null OR social_end_time <![CDATA[ >= ]]> #{billMonth} OR social_end_time ='')
+        AND non_payment = #{nonPayment}
     </select>
 
     <select id="listAll" resultMap="BaseResultMap">
diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
index 18d48fccd..d527bdad7 100644
--- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
@@ -5711,12 +5711,12 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
      */
     public List<Long> listCanPayEmpIds(Long paymentOrganization, String billMonth) {
         List<Long> listCanPayEmpIds = new ArrayList<>();
-        //社保档案中可进行缴纳的人员
-        List<Long> socialCanPayEmpIds = getSocialSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth);
-        //公积金档案中可进行缴纳的人员
-        List<Long> fundCanPayEmpIds = getFundSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth);
-        //其他福利档案中可进行缴纳的人员
-        List<Long> otherCanPayEmpIds = getOtherSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth);
+        //社保档案中可进行缴纳的人员 （未勾选暂不缴纳）
+        List<Long> socialCanPayEmpIds = getSocialSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth, 0);
+        //公积金档案中可进行缴纳的人员（未勾选暂不缴纳）
+        List<Long> fundCanPayEmpIds = getFundSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth, 0);
+        //其他福利档案中可进行缴纳的人员（未勾选暂不缴纳）
+        List<Long> otherCanPayEmpIds = getOtherSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth, 0);
         if (socialCanPayEmpIds != null && socialCanPayEmpIds.size() > 0) {
             listCanPayEmpIds.addAll(socialCanPayEmpIds);
         }

From be59482fc889227fd051fcd26585421690e7940e Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Sat, 8 Feb 2025 11:28:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=E7=A4=BE=E4=BF=9D=E7=A6=8F=E5=88=A9?=
 =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E6=A0=B8=E7=AE=97=E4=BA=BA=E5=91=98bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../siaccount/SIAccountDetailTempMapper.java  |  2 +
 .../siaccount/SIAccountDetailTempMapper.xml   |  8 +++
 .../service/impl/SIAccountServiceImpl.java    | 64 ++++++++++---------
 3 files changed, 45 insertions(+), 29 deletions(-)

diff --git a/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.java b/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.java
index 75fbefcaa..7a470a222 100644
--- a/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.java
+++ b/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.java
@@ -28,6 +28,8 @@ public interface SIAccountDetailTempMapper {
      */
     void batchDelByEmpIdsAndMonthAndPayOrg(@Param("employeeIds") Collection<Long> employeeIds, @Param("billMonth") String billMonth, @Param("paymentOrganization") Long paymentOrganization);
 
+    void batchDelByMonthAndPayOrg(@Param("billMonth") String billMonth, @Param("paymentOrganization") Long paymentOrganization);
+
     /**
      * 批量保存
      * @param accounts
diff --git a/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.xml b/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.xml
index ca12fe478..a5fa46fca 100644
--- a/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.xml
+++ b/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.xml
@@ -139,6 +139,14 @@
         </foreach>
     </delete>
 
+    <update id="batchDelByMonthAndPayOrg">
+        UPDATE hrsa_bill_detail_temp
+        SET delete_type = 1
+        WHERE delete_type = 0
+        AND bill_month = #{billMonth}
+        AND payment_organization = #{paymentOrganization}
+    </update>
+
 
     <insert id="batchSaveAccountTempDetails">
         INSERT INTO hrsa_bill_detail_temp
diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
index c64e4e6fe..6c1a30028 100644
--- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
@@ -5073,7 +5073,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
 //        Map<Long, InsuranceArchivesAccountPO> insuranceArchivesAccountPOS = siArchivesBiz.buildBatchAccount(ids, paymentOrganization);
         Map<Long, InsuranceArchivesAccountPO> insuranceArchivesAccountPOS = getSIArchivesService(user).buildBatchAccount(ids, paymentOrganization);
         List<InsuranceAccountDetailPO> historyDetailData = new ArrayList<>();
-        List<DataCollectionEmployee> employeeList = new ArrayList<>();
+        List<DataCollectionEmployee> employeeList = getSalaryEmployeeService(user).listByIds(ids);
         if (!isFirstFlag) {
             // 不是首次核算，需要把社保历史数据取出
             List<List<Long>> partition = Lists.partition(ids, 100);
@@ -5081,8 +5081,6 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
                 historyDetailData.addAll(getInsuranceAccountDetailMapper().list(InsuranceAccountDetailParam.builder().billMonth(billMonth).paymentOrganization(paymentOrganization.toString()).employeeIds(part).build()));
                 historyDetailData.addAll(getInsuranceAccountDetailMapper().extList(InsuranceAccountDetailParam.builder().billMonth(billMonth).paymentOrganization(paymentOrganization.toString()).employeeIds(part).build()));
             });
-        } else {
-            employeeList = getSalaryEmployeeService(user).listByIds(ids);
         }
         Map<Long, InsuranceAccountDetailPO> historyDetailDataMap = SalaryEntityUtil.convert2Map(historyDetailData, InsuranceAccountDetailPO::getEmployeeId);
         Map<Long, DataCollectionEmployee> employeeMap = SalaryEntityUtil.convert2Map(employeeList, DataCollectionEmployee::getEmployeeId);
@@ -5104,7 +5102,9 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
             insuranceAccountDetailPO.setResourceFrom(ResourceFromEnum.SYSTEM.getValue());
             insuranceAccountDetailPO.setTenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY);
             insuranceAccountDetailPO.setPaymentOrganization(paymentOrganization);
-            if (isFirstFlag) {
+
+            InsuranceAccountDetailPO historyDetail = historyDetailDataMap.get(k);
+            if (isFirstFlag || historyDetail == null) {
                 // 初次核算
                 DataCollectionEmployee employee = employeeMap.get(k);
                 if (employee != null) {
@@ -5119,18 +5119,15 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
                     insuranceAccountDetailPO.setStatus(employee.getStatus());
                 }
             } else {
-                InsuranceAccountDetailPO historyDetail = historyDetailDataMap.get(k);
-                if (historyDetail != null) {
-                    insuranceAccountDetailPO.setSubcompanyName(historyDetail.getSubcompanyName());
-                    insuranceAccountDetailPO.setSubcompanyId(historyDetail.getSubcompanyId());
-                    insuranceAccountDetailPO.setDepartmentName(historyDetail.getDepartmentName());
-                    insuranceAccountDetailPO.setDepartmentId(historyDetail.getDepartmentId());
-                    insuranceAccountDetailPO.setJobtitleName(historyDetail.getJobtitleName());
-                    insuranceAccountDetailPO.setJobtitleId(historyDetail.getJobtitleId());
-                    insuranceAccountDetailPO.setJobcall(historyDetail.getJobcall());
-                    insuranceAccountDetailPO.setJobcallId(historyDetail.getJobcallId());
-                    insuranceAccountDetailPO.setStatus(historyDetail.getStatus());
-                }
+                insuranceAccountDetailPO.setSubcompanyName(historyDetail.getSubcompanyName());
+                insuranceAccountDetailPO.setSubcompanyId(historyDetail.getSubcompanyId());
+                insuranceAccountDetailPO.setDepartmentName(historyDetail.getDepartmentName());
+                insuranceAccountDetailPO.setDepartmentId(historyDetail.getDepartmentId());
+                insuranceAccountDetailPO.setJobtitleName(historyDetail.getJobtitleName());
+                insuranceAccountDetailPO.setJobtitleId(historyDetail.getJobtitleId());
+                insuranceAccountDetailPO.setJobcall(historyDetail.getJobcall());
+                insuranceAccountDetailPO.setJobcallId(historyDetail.getJobcallId());
+                insuranceAccountDetailPO.setStatus(historyDetail.getStatus());
             }
 
             //核算社保
@@ -5160,10 +5157,12 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
 
         }
         //临时表入库前先对（可能存在的）历史数据进行删除
-        List<List<Long>> partition = Lists.partition((List<Long>) ids, 100);
-        partition.forEach(part -> {
-            getSIAccountDetailTempMapper().batchDelByEmpIdsAndMonthAndPayOrg(part, billMonth, paymentOrganization);
-        });
+        // List<List<Long>> partition = Lists.partition((List<Long>) ids, 100);
+        // partition.forEach(part -> {
+        //     getSIAccountDetailTempMapper().batchDelByEmpIdsAndMonthAndPayOrg(part, billMonth, paymentOrganization);
+        // });
+        // 根据人员id删，会少删不再参与社保核算的人。
+        getSIAccountDetailTempMapper().batchDelByMonthAndPayOrg(billMonth, paymentOrganization);
         //临时表数据入库
         if (CollectionUtils.isNotEmpty(list)) {
             encryptUtil.encryptList(list, InsuranceAccountDetailTempPO.class);
@@ -5747,16 +5746,23 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
             log.info("核算明细临时表 hrsa_bill_detail_temp待处理数量：{}", list.size());
             List<List<Long>> partitionIds = Lists.partition((List<Long>) ids, 100);
             log.info("bill_detail入库前删除数据数量：{}", ids.size());
-            for (List<Long> part : partitionIds) {
-                getInsuranceAccountDetailMapper().batchDelAccountDetails(part, billMonth, param.getPaymentOrganization(), paymentStatus);
+            getInsuranceAccountDetailMapper().batchDelAccountDetails(Collections.emptyList(), billMonth, param.getPaymentOrganization(), paymentStatus);
 
-                //删除账单月份+个税扣缴义务人+人员id下的调差数据
-                getInsuranceCompensationMapper().deleteByBillMonthPayOrgEmpIds(InsuranceCompensationPO.builder()
-                        .billMonth(billMonth)
-                        .paymentOrganization(param.getPaymentOrganization())
-                        .employeeIds(part)
-                        .build());
-            }
+            //删除账单月份+个税扣缴义务人+人员id下的调差数据
+            getInsuranceCompensationMapper().deleteByBillMonthPayOrgEmpIds(InsuranceCompensationPO.builder()
+                    .billMonth(billMonth)
+                    .paymentOrganization(param.getPaymentOrganization())
+                    .build());
+            // for (List<Long> part : partitionIds) {
+            //     getInsuranceAccountDetailMapper().batchDelAccountDetails(part, billMonth, param.getPaymentOrganization(), paymentStatus);
+            //
+            //     //删除账单月份+个税扣缴义务人+人员id下的调差数据
+            //     getInsuranceCompensationMapper().deleteByBillMonthPayOrgEmpIds(InsuranceCompensationPO.builder()
+            //             .billMonth(billMonth)
+            //             .paymentOrganization(param.getPaymentOrganization())
+            //             .employeeIds(part)
+            //             .build());
+            // }
 
             //生成bill_detail入库数据
             List<InsuranceAccountDetailPO> collect = list.stream().map(item -> {