From c97b593f5dc3de5df950130202d7706e1d8c9223 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Thu, 24 Jul 2025 22:03:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=89=E9=98=B3=E6=91=A9=E6=89=98=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SalaryAcctResultServiceImpl.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java index 9d612f44f..be665c0bd 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java @@ -1288,6 +1288,11 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe } // 查询薪资核算记录 List salaryAcctRecordList = getSalaryAcctRecordService(user).listBySalaryMonth(LocalDateRange.builder().fromDate(param.getSalaryMonth()).endDate(param.getSalaryMonth()).build()); + // 过滤账套 + List 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 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 salaryAcctRecordList = getSalaryAcctRecordService(user).listBySalaryMonth(LocalDateRange.builder().fromDate(param.getSalaryMonth()).endDate(param.getSalaryMonth()).build()); + + // 过滤账套 + List 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 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> dataList = new ArrayList<>(); List notExitYgxzIds = groupByYgxz.keySet().stream().filter(id -> !hrmusekindMap.containsKey(id)).collect(Collectors.toList());