qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

领悦报表逻辑修改调整

This commit is contained in:
harryxzy 2025-12-24 16:43:16 +08:00
parent 21eb4eb5d3
commit 7622a5f60f
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/mapper/ly/UfSbgjjMapper.java
View File

@ -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);
}

18
src/com/engine/salary/mapper/ly/UfSbgjjMapper.xml
View File

@ -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>

9
src/com/engine/salary/service/impl/LySalaryReportServiceImpl.java
View File

@ -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("");