From e1b4927eaa19499cba48b545fb3abbd5486aea3c Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Thu, 16 Mar 2023 14:52:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SIAccountServiceImpl.java | 39 ------------------- 1 file changed, 39 deletions(-) diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index 47d8d7e4c..2d28a6d1e 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -2865,45 +2865,6 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { } datas.put("sumRow", sumRow); return datas; -// records.stream().collect(Collectors.groupingBy(record -> record.getk)) -// -// -// .collect(Collectors.groupingBy(Main::getMapKey, Collectors.counting())); -// records.stream().flatMap(Collectors.toList()); -// -// -// // 查询薪资核算人员 -// List salaryAcctEmployeePOS = getSalaryAcctEmployeeService(user).listByResultQueryParam(queryParam); -// -// if (CollectionUtils.isEmpty(salaryAcctEmployeePOS)) { -// return null; -// } -// // 查询薪资核算记录 -// SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(queryParam.getSalaryAcctRecordId()); -// if (Objects.isNull(salaryAcctRecordPO)) { -// throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除")); -// } -// // 查询薪资核算所用薪资账套的薪资项目 -// List salarySobItemPOS = getSalarySobItemService(user).listBySalarySobId(salaryAcctRecordPO.getSalarySobId()); -// Set salaryItemIds = SalaryEntityUtil.properties(salarySobItemPOS, SalarySobItemPO::getSalaryItemId); -// List salaryItemPOS = getSalaryItemService(user).listByIds(salaryItemIds); -// // 查询薪资核算结果 -// Set salaryAcctEmployeeIds = SalaryEntityUtil.properties(salaryAcctEmployeePOS, SalaryAcctEmployeePO::getId); -// List salaryAcctResultPOS = listBySalaryAcctEmployeeIds(salaryAcctEmployeeIds); -// -// Map map = new HashMap<>(); -// Map> acctResultMap = SalaryEntityUtil.group2Map(salaryAcctResultPOS, SalaryAcctResultPO::getSalaryItemId); -// salaryItemPOS.stream().filter(item -> SalaryDataTypeEnum.NUMBER.getValue().equals(item.getDataType())).forEach(item -> { -// BigDecimal sum = Optional.ofNullable(acctResultMap.get(item.getId())) -// .orElse(new ArrayList<>()) -// .stream() -// .map(SalaryAcctResultPO::getResultValue) -// .filter(NumberUtils::isCreatable) -// .map(BigDecimal::new) -// .reduce(BigDecimal.ZERO, BigDecimal::add); -// map.put(item.getId().toString(), SalaryAcctFormulaBO.roundResultValue(sum.toString(), item, Collections.emptyList(), Collections.emptyMap())); -// }); -// return null; } /**