From b6331b952c940f201502f5a900e9a24fcf77a1f5 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Wed, 5 Jun 2024 11:02:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=201=E3=80=81=E7=A4=BE?=
 =?UTF-8?q?=E4=BF=9D=E7=A6=8F=E5=88=A9=E5=8F=B0=E8=B4=A6=E8=A1=A5=E5=B7=AE?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=EF=BC=8C?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E6=98=AF=E8=A1=A5=E5=B7=AE=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=EF=BC=9B=202=E3=80=81=E6=8A=A5=E8=A1=A8=E5=88=86?=
 =?UTF-8?q?=E4=BA=AB=E4=B8=8D=E8=AE=BE=E7=BD=AE=E8=B5=B7=E5=A7=8B=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E6=97=B6oracle=E6=95=B0=E6=8D=AE=E5=BA=93=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9=E9=97=AE=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InsuranceAccountDetailMapper.java         |  8 +++++
 .../InsuranceAccountDetailMapper.xml          | 11 ++++++
 .../impl/SalaryStatisticsPushServiceImpl.java |  2 +-
 .../service/impl/SIAccountServiceImpl.java    | 36 ++++++++++++++++++-
 4 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java
index 2dec937ca..2a05a0c72 100644
--- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java
+++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java
@@ -116,6 +116,14 @@ public interface InsuranceAccountDetailMapper {
      */
     List<InsuranceAccountDetailPO> querySupplementListByBillMonth(@Param("billMonth") String billMonth, @Param("paymentOrganization") Long paymentOrganization);
 
+    /**
+     * 查询补差数据
+     * @param billMonth 账单月份
+     * @param paymentOrganization 个税扣缴义务人
+     * @return
+     */
+    List<InsuranceAccountDetailPO> queryBalanceListByBillMonth(@Param("billMonth") String billMonth, @Param("paymentOrganization") Long paymentOrganization);
+
     /**
      * 查询正常缴纳数据
      * @param billMonth 账单月份
diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
index 55b55947e..2f58bed17 100644
--- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
+++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
@@ -541,6 +541,17 @@
         AND t.payment_organization = #{paymentOrganization}
     </select>
 
+    <select id="queryBalanceListByBillMonth" resultMap="BaseResultMap">
+        SELECT
+            t.id,t.employee_id,t.supplementary_month,t.supplementary_projects
+        FROM
+            hrsa_bill_detail t
+        WHERE t.delete_type = 0
+          AND t.payment_status = 4
+          AND t.bill_month = #{billMonth}
+          AND t.payment_organization = #{paymentOrganization}
+    </select>
+
     <select id="queryNormalListByBillMonth" resultMap="BaseResultMap">
         SELECT
         t.id,t.employee_id
diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsPushServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsPushServiceImpl.java
index 2397700e4..421f0a18e 100644
--- a/src/com/engine/salary/report/service/impl/SalaryStatisticsPushServiceImpl.java
+++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsPushServiceImpl.java
@@ -746,7 +746,7 @@ public class SalaryStatisticsPushServiceImpl extends Service implements SalarySt
         // 报表分享时间校验
         String formatLocalDateTime = SalaryDateUtil.getFormatLocalDate(LocalDateTime.now());
         List<SalaryStatisticsPushPO> result = pushList.stream().filter(pushPO -> {
-            if (pushPO.getStartTime().compareTo(formatLocalDateTime) > 0 || (StringUtils.isNotEmpty(pushPO.getEndTime()) && pushPO.getEndTime().compareTo(formatLocalDateTime) < 0)) {
+            if ((StringUtils.isNotBlank(pushPO.getStartTime()) && pushPO.getStartTime().compareTo(formatLocalDateTime) > 0) || (StringUtils.isNotEmpty(pushPO.getEndTime()) && pushPO.getEndTime().compareTo(formatLocalDateTime) < 0)) {
                 return false;
             }
             return true;
diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
index 9bbaf600f..cbd761e95 100644
--- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
@@ -2056,6 +2056,40 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
         return resultList;
     }
 
+    /**
+     * 获取福利台账中的补差数据
+     * @param billMonth 账单月份
+     * @param paymentOrganization 个税扣缴义务人id
+     * @return
+     */
+    private List<Map<String, Object>> getBalanceDataByBillMonth(String billMonth, Long paymentOrganization) {
+
+        List<Map<String, Object>> resultList = new ArrayList<>();
+
+        DataCollectionEmployee employee = new DataCollectionEmployee();
+
+        TaxAgentPO taxAgentPO = taxAgentBiz.getById(paymentOrganization);
+
+        List<InsuranceAccountDetailPO> balanceDataList = getInsuranceAccountDetailMapper().queryBalanceListByBillMonth(billMonth, paymentOrganization);
+
+
+        for(InsuranceAccountDetailPO po : balanceDataList) {
+            Map<String, Object> resultMap = new HashMap<>();
+            employee = getSalaryEmployeeService(user).getEmployeeById(po.getEmployeeId());
+            resultMap.put("username", employee.getUsername());
+            resultMap.put("departmentName", employee.getDepartmentName());
+            resultMap.put("mobile", employee.getMobile());
+            resultMap.put("workcode", employee.getWorkcode());
+            resultMap.put("idNo", employee.getIdNo());
+            resultMap.put("taxAgentName", taxAgentPO.getName());
+            resultMap.put("billMonth", billMonth);
+            resultMap.put("supplementaryMonth", po.getSupplementaryMonth());
+
+            resultList.add(resultMap);
+        }
+        return resultList;
+    }
+
     /**
      * 获取福利台账中的正常缴纳数据
      * @param billMonth 账单月份
@@ -3774,7 +3808,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
 
         List<List<Object>> rows = new ArrayList<>();
         //查询当前已有的补差数据
-        List<Map<String, Object>> resultMapList = getSupplyDataByBillMonth(param.getBillMonth(), param.getPaymentOrganization());
+        List<Map<String, Object>> resultMapList = getBalanceDataByBillMonth(param.getBillMonth(), param.getPaymentOrganization());
         // excel导出的数据
         rows.add(headerList);
         for (Map<String, Object> map : resultMapList) {