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

光阳摩托调整

This commit is contained in:
Harryxzy 2025-07-24 22:03:50 +08:00
parent 2553df3302
commit c97b593f5d
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
View File

@ -1288,6 +1288,11 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
}
// 查询薪资核算记录
List<SalaryAcctRecordPO> salaryAcctRecordList = getSalaryAcctRecordService(user).listBySalaryMonth(LocalDateRange.builder().fromDate(param.getSalaryMonth()).endDate(param.getSalaryMonth()).build());
// 过滤账套
List<Long> salarySobIds = Arrays.stream(baseBean.getPropValue("czgymtSalaryReport", "sfgz_salary_sob_ids").split(","))
.filter(NumberUtils::isCreatable).map(Long::valueOf).collect(Collectors.toList());
salaryAcctRecordList = salaryAcctRecordList.stream().filter(record -> salarySobIds.contains(record.getSalarySobId())).collect(Collectors.toList());
// 过滤未归档数据
// salaryAcctRecordList = salaryAcctRecordList.stream().filter(record -> record.getStatus() > SalaryAcctRecordStatusEnum.NOT_ARCHIVED.getValue()).collect(Collectors.toList());
List<Long> salaryAcctRecordIds = salaryAcctRecordList.stream().map(SalaryAcctRecordPO::getId).collect(Collectors.toList());
@ -1473,6 +1478,11 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
BaseBean baseBean = new BaseBean();
// 查询薪资核算记录
List<SalaryAcctRecordPO> salaryAcctRecordList = getSalaryAcctRecordService(user).listBySalaryMonth(LocalDateRange.builder().fromDate(param.getSalaryMonth()).endDate(param.getSalaryMonth()).build());
// 过滤账套
List<Long> salarySobIds = Arrays.stream(baseBean.getPropValue("czgymtSalaryReport", "gzhz_salary_sob_ids").split(","))
.filter(NumberUtils::isCreatable).map(Long::valueOf).collect(Collectors.toList());
salaryAcctRecordList = salaryAcctRecordList.stream().filter(record -> salarySobIds.contains(record.getSalarySobId())).collect(Collectors.toList());
// 过滤未归档数据
// salaryAcctRecordList = salaryAcctRecordList.stream().filter(record -> record.getStatus() > SalaryAcctRecordStatusEnum.NOT_ARCHIVED.getValue()).collect(Collectors.toList());
List<Long> salaryAcctRecordIds = salaryAcctRecordList.stream().map(SalaryAcctRecordPO::getId).collect(Collectors.toList());
@ -1566,6 +1576,8 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
while (rs.next()) {
hrmusekindMap.put(Long.valueOf(rs.getInt("id")), Util.formatMultiLang(rs.getString("name")));
}
int qtryYgxzId = NumberUtils.isCreatable(baseBean.getPropValue("czgymtSalaryReport", "qtry_ygxz_id")) ? Integer.valueOf(baseBean.getPropValue("czgymtSalaryReport", "qtry_ygxz_id")) : -1;
hrmusekindMap.put(Long.valueOf(qtryYgxzId), "台籍");
// 每个用工性质需要有一个小记
ArrayList<Map<String, Object>> dataList = new ArrayList<>();
List<Long> notExitYgxzIds = groupByYgxz.keySet().stream().filter(id -> !hrmusekindMap.containsKey(id)).collect(Collectors.toList());