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

昂立薪酬二开-优化

This commit is contained in:
Harryxzy 2024-06-05 09:24:10 +08:00
parent 137006b6bd
commit 6e6fde89cb
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
View File

@ -215,7 +215,10 @@ public class SalaryAcctResultWrapper extends Service {
String itemName = salaryItemMap.get(itemId);
if (StringUtils.isNotBlank(itemName)) {
List<SalaryAcctResultPO> resultPOList = resultGroupByItemId.get(itemId);
BigDecimal sumValue = resultPOList.stream().map(SalaryAcctResultPO::getResultValue).filter(NumberUtils::isNumber).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
BigDecimal sumValue = new BigDecimal(0);
if (resultPOList != null) {
sumValue = resultPOList.stream().map(SalaryAcctResultPO::getResultValue).filter(NumberUtils::isNumber).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
}
Map<String, Object> resultItemMap = new HashMap<>();
resultItemMap.put("name", itemName);
resultItemMap.put("id", itemId);
@ -246,8 +249,11 @@ public class SalaryAcctResultWrapper extends Service {
String itemName = salaryItemMap.get(itemId);
if (StringUtils.isNotBlank(itemName)) {
List<SalaryAcctResultPO> resultPOList = lastMonthResultGroupByItemId.get(itemId);
BigDecimal sumValue = resultPOList.stream().map(SalaryAcctResultPO::getResultValue).filter(NumberUtils::isNumber).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
// lastRecordStr.append(" ").append(itemName).append(":").append(sumValue.toString());
BigDecimal sumValue = new BigDecimal(0);
if (resultPOList != null) {
sumValue = resultPOList.stream().map(SalaryAcctResultPO::getResultValue).filter(NumberUtils::isNumber).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
}
// lastRecordStr.append(" ").append(itemName).append(":").append(sumValue.toString());
Map<String, Object> resultItemMap = new HashMap<>();
resultItemMap.put("name", itemName);
resultItemMap.put("id", itemId);