From 7622a5f60f4579699f7ac50d8d136c8c221518e5 Mon Sep 17 00:00:00 2001
From: harryxzy <xuzhuoyan_xzy@163.com>
Date: Wed, 24 Dec 2025 16:43:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=82=A6=E6=8A=A5=E8=A1=A8=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/salary/mapper/ly/UfSbgjjMapper.java |  2 ++
 .../engine/salary/mapper/ly/UfSbgjjMapper.xml  | 18 ++++++++++++++++--
 .../impl/LySalaryReportServiceImpl.java        |  9 +++++----
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/com/engine/salary/mapper/ly/UfSbgjjMapper.java b/src/com/engine/salary/mapper/ly/UfSbgjjMapper.java
index f4264f70d..eefe95138 100644
--- a/src/com/engine/salary/mapper/ly/UfSbgjjMapper.java
+++ b/src/com/engine/salary/mapper/ly/UfSbgjjMapper.java
@@ -16,6 +16,8 @@ public interface UfSbgjjMapper {
 
 
     List<UfSbInfo> listSbInfoByFyssq(@Param("fyssq")String fyssq);
+    List<UfSbInfo> listSbInfoByDyxzzq(@Param("dyxzzq")String dyxzzq);
 
     List<UfGjjInfo> listGjjInfoByFyssq(@Param("fyssq") String fyssq);
+    List<UfGjjInfo> listGjjInfoByDyxzzq(@Param("dyxzzq") String dyxzzq);
 }
diff --git a/src/com/engine/salary/mapper/ly/UfSbgjjMapper.xml b/src/com/engine/salary/mapper/ly/UfSbgjjMapper.xml
index d6d405689..8deae532d 100644
--- a/src/com/engine/salary/mapper/ly/UfSbgjjMapper.xml
+++ b/src/com/engine/salary/mapper/ly/UfSbgjjMapper.xml
@@ -78,7 +78,14 @@
         SELECT
         <include refid="sbBaseColumns" />
         FROM uf_sbgjj t
-        WHERE dyxzzq = #{fyssq}
+        WHERE fyszq = #{fyssq}
+    </select>
+
+    <select id="listSbInfoByDyxzzq" resultMap="SbBaseResultMap">
+        SELECT
+        <include refid="sbBaseColumns" />
+        FROM uf_sbgjj t
+        WHERE dyxzzq = #{dyxzzq}
     </select>
 
 
@@ -127,7 +134,14 @@
         SELECT
         <include refid="gjjBaseColumns" />
         FROM uf_sbgjj t
-        WHERE dyxzzq = #{fyssq}
+        WHERE fyszq = #{fyssq}
+    </select>
+
+    <select id="listGjjInfoByDyxzzq" resultMap="GjjBaseResultMap">
+        SELECT
+        <include refid="gjjBaseColumns" />
+        FROM uf_sbgjj t
+        WHERE dyxzzq = #{dyxzzq}
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/src/com/engine/salary/service/impl/LySalaryReportServiceImpl.java b/src/com/engine/salary/service/impl/LySalaryReportServiceImpl.java
index 7f2d7a0c2..882f3e9ac 100644
--- a/src/com/engine/salary/service/impl/LySalaryReportServiceImpl.java
+++ b/src/com/engine/salary/service/impl/LySalaryReportServiceImpl.java
@@ -2124,7 +2124,8 @@ public class LySalaryReportServiceImpl extends Service implements LySalaryReport
         }
 
         // 获取当月导入社保数据
-        List<UfSbInfo> ufSbInfos = getLyUfSbgjjMapper().listSbInfoByFyssq(salaryMonth);
+//        List<UfSbInfo> ufSbInfos = getLyUfSbgjjMapper().listSbInfoByFyssq(salaryMonth);
+        List<UfSbInfo> ufSbInfos = getLyUfSbgjjMapper().listSbInfoByDyxzzq(salaryMonth);
         ufSbInfos = ufSbInfos.stream().map(info -> {
             if (info.getGmgsqc() == null) {
                 info.setGmgsqc("");
@@ -2317,7 +2318,7 @@ public class LySalaryReportServiceImpl extends Service implements LySalaryReport
         }
 
         // 获取当月导入公积金数据
-        List<UfGjjInfo> ufGjjInfos = getLyUfSbgjjMapper().listGjjInfoByFyssq(salaryMonth);
+        List<UfGjjInfo> ufGjjInfos = getLyUfSbgjjMapper().listGjjInfoByDyxzzq(salaryMonth);
         // 根据公积金购买公司汇总
         ufGjjInfos = ufGjjInfos.stream().map(value -> {
             if (value.getFycdgsqc() == null) {
@@ -2448,7 +2449,7 @@ public class LySalaryReportServiceImpl extends Service implements LySalaryReport
         }
 
         // 获取当月导入社保数据
-        List<UfSbInfo> ufSbInfos = getLyUfSbgjjMapper().listSbInfoByFyssq(salaryMonth);
+        List<UfSbInfo> ufSbInfos = getLyUfSbgjjMapper().listSbInfoByDyxzzq(salaryMonth);
         ufSbInfos = ufSbInfos.stream().map(value -> {
             if (value.getGmgsqc() == null) {
                 value.setGmgsqc("");
@@ -2677,7 +2678,7 @@ public class LySalaryReportServiceImpl extends Service implements LySalaryReport
         }
 
         // 获取当月导入社保数据
-        List<UfGjjInfo> ufGjjInfos = getLyUfSbgjjMapper().listGjjInfoByFyssq(salaryMonth);
+        List<UfGjjInfo> ufGjjInfos = getLyUfSbgjjMapper().listGjjInfoByDyxzzq(salaryMonth);
         ufGjjInfos = ufGjjInfos.stream().map(value -> {
             if (value.getFycdgsqc() == null) {
                 value.setFycdgsqc("");