From cf3d070892e5b1db9ef8a77721faa5f34e4aa7cb Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Wed, 18 Jun 2025 16:56:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B1=87=E9=80=9Abug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../siaccount/InsuranceAccountBatchMapper.java  |  3 ++-
 .../siaccount/InsuranceAccountBatchMapper.xml   | 12 ++++++++++++
 .../siaccount/InsuranceAccountDetailMapper.xml  |  4 ++--
 .../SalaryStatisticsEmployeeWrapper.java        |  4 +++-
 .../service/impl/SIAccountServiceImpl.java      | 17 +++++++++++++----
 5 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.java b/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.java
index 7a183297d..5a75c532a 100644
--- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.java
+++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.java
@@ -2,7 +2,6 @@ package com.engine.salary.mapper.siaccount;
 
 import com.engine.salary.entity.siaccount.param.InsuranceAccountBatchParam;
 import com.engine.salary.entity.siaccount.po.InsuranceAccountBatchPO;
-import com.engine.salary.entity.siarchives.po.InsuranceArchivesOtherSchemePO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -29,6 +28,8 @@ public interface InsuranceAccountBatchMapper {
      */
     InsuranceAccountBatchPO getByBillMonth(@Param("billMonth") String billMonth,@Param("paymentOrganization") Long paymentOrganization);
 
+    List<InsuranceAccountBatchPO> listByBillMonth(@Param("billMonth") String billMonth,@Param("paymentOrganization") Long paymentOrganization);
+
     /**
      * 插入
      * @param insuranceAccountBatchPO
diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.xml
index 04d59ade8..45e97cf4b 100644
--- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.xml
+++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.xml
@@ -186,6 +186,18 @@
         </if>
     </select>
 
+    <select id="listByBillMonth" resultType="com.engine.salary.entity.siaccount.po.InsuranceAccountBatchPO">
+        SELECT
+        <include refid="baseColumns"/>
+        FROM
+        hrsa_bill_batch t
+        WHERE t.delete_type = 0
+        AND t.bill_month = #{billMonth}
+        <if test="paymentOrganization != null">
+            AND t.payment_organization = #{paymentOrganization}
+        </if>
+    </select>
+
 
     <select id="getByBillStatus" resultMap="BaseResultMap">
         SELECT
diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
index 38414fc77..cda35be75 100644
--- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
+++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
@@ -58,7 +58,7 @@
         <result column="jobcall" property="jobcall"/>
         <result column="jobcall_id" property="jobcallId"/>
         <result column="status" property="status"/>
-
+        <result column="payment_organization" property="paymentOrganization"/>
     </resultMap>
 
     <!-- 表字段 -->
@@ -571,7 +571,7 @@
         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,t.payment_status,
-        t.social_payment_base_string,t.fund_payment_base_string,t.other_payment_base_string
+        t.social_payment_base_string,t.fund_payment_base_string,t.other_payment_base_string, t.payment_organization
         FROM
         hrsa_bill_detail t
         WHERE t.delete_type = 0
diff --git a/src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java b/src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java
index 2a4bdd282..ac920b385 100644
--- a/src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java
+++ b/src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java
@@ -120,7 +120,9 @@ public class SalaryStatisticsEmployeeWrapper extends Service {
                         }
                     }
                 }
-                countResultMap.put(itemKey, ReportDataUtil.thousandthConvert(sumBigDecimal.toString()));
+                if (item.getDataType().equals(SalaryDataTypeEnum.NUMBER.getValue())) {
+                    countResultMap.put(itemKey, ReportDataUtil.thousandthConvert(sumBigDecimal.toString()));
+                }
             }
         }
         PageInfo<Map<String, Object>> pageInfo = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), records);
diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
index d61c89eb3..d011de5f4 100644
--- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
@@ -984,11 +984,14 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
 
     @Override
     public List<Map<String, Object>> welfareData(String billMonth, List<Long> employeeIds, Long taxAgentId) {
-        InsuranceAccountBatchPO insuranceAccountBatchPO = getInsuranceAccountBatchMapper().getByBillMonth(billMonth, taxAgentId);
-        insuranceAccountBatchPO = encryptUtil.decrypt(insuranceAccountBatchPO, InsuranceAccountBatchPO.class);
-        if (insuranceAccountBatchPO == null || Objects.equals(BillStatusEnum.NOT_ARCHIVED.getValue(), insuranceAccountBatchPO.getBillStatus())) {
-            return Lists.newArrayList();
+        // InsuranceAccountBatchPO insuranceAccountBatchPO = getInsuranceAccountBatchMapper().getByBillMonth(billMonth, taxAgentId);
+        List<InsuranceAccountBatchPO> insuranceAccountBatchPOS = getInsuranceAccountBatchMapper().listByBillMonth(billMonth, taxAgentId);
+
+        if (CollectionUtils.isEmpty(insuranceAccountBatchPOS)) {
+            return Collections.emptyList();
         }
+        // 没有归档的义务人
+        List<Long> notFiledTaxAgentIds = insuranceAccountBatchPOS.stream().filter(po -> po.getBillStatus().equals(BillStatusEnum.NOT_ARCHIVED.getValue())).map(InsuranceAccountBatchPO::getPaymentOrganization).collect(Collectors.toList());
 
         //20230707增加福利核算明细中的缴纳状态+合计的数据项
 //        List<InsuranceAccountDetailPO> insuranceAccountDetailPOS = getInsuranceAccountDetailMapper().queryList(billMonth, taxAgentId, employeeIds);
@@ -1006,6 +1009,12 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
                         || f.getPaymentStatus().equals(PaymentStatusEnum.REPAIR.getValue())
                         || f.getPaymentStatus().equals(PaymentStatusEnum.BALANCE.getValue()) )
                 .collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(notFiledTaxAgentIds)) {
+            // 过滤未归档的
+            insuranceAccountDetailPOS = insuranceAccountDetailPOS.stream()
+                    .filter(f -> !notFiledTaxAgentIds.contains(f.getPaymentOrganization()))
+                    .collect(Collectors.toList());
+        }
         List<InsuranceAccountDetailPO> list = buildNewInsuranceDetailPOS(insuranceAccountDetailPOS);
         Map<String, InsuranceAccountDetailPO> siAcctResultWithEmpAndPayStatus = insuranceAccountDetailPOS.stream()
                 .collect(Collectors.toMap(po -> po.getEmployeeId() + "_" + po.getPaymentStatus(), a -> a, (a, b) -> a));