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 listSbInfoByFyssq(@Param("fyssq")String fyssq); + List listSbInfoByDyxzzq(@Param("dyxzzq")String dyxzzq); List listGjjInfoByFyssq(@Param("fyssq") String fyssq); + List 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 FROM uf_sbgjj t - WHERE dyxzzq = #{fyssq} + WHERE fyszq = #{fyssq} + + + @@ -127,7 +134,14 @@ SELECT FROM uf_sbgjj t - WHERE dyxzzq = #{fyssq} + WHERE fyszq = #{fyssq} + + + \ 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 ufSbInfos = getLyUfSbgjjMapper().listSbInfoByFyssq(salaryMonth); +// List ufSbInfos = getLyUfSbgjjMapper().listSbInfoByFyssq(salaryMonth); + List 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 ufGjjInfos = getLyUfSbgjjMapper().listGjjInfoByFyssq(salaryMonth); + List 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 ufSbInfos = getLyUfSbgjjMapper().listSbInfoByFyssq(salaryMonth); + List 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 ufGjjInfos = getLyUfSbgjjMapper().listGjjInfoByFyssq(salaryMonth); + List ufGjjInfos = getLyUfSbgjjMapper().listGjjInfoByDyxzzq(salaryMonth); ufGjjInfos = ufGjjInfos.stream().map(value -> { if (value.getFycdgsqc() == null) { value.setFycdgsqc("");