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

Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01

This commit is contained in:
Harryxzy 2025-07-09 10:09:10 +08:00
parent cbdc483c4c fb239f34ed
commit e225965e33
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -405,11 +405,13 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
if (openSum != null && StringUtils.isNotBlank(openSum.getConfValue()) && OpenEnum.parseByValue(openSum.getConfValue()) == OpenEnum.OPEN) { if (openSum != null && StringUtils.isNotBlank(openSum.getConfValue()) && OpenEnum.parseByValue(openSum.getConfValue()) == OpenEnum.OPEN) {
total = true; total = true;
Map<String, Object> sumRow = getSalaryAcctResultService(user).sumRow(queryParam); Map<String, Object> sumRow = getSalaryAcctResultService(user).sumRow(queryParam);
sumRow.forEach((k, v) -> { if (sumRow != null) {
if (NumberUtils.isCreatable(v.toString())) { sumRow.forEach((k, v) -> {
sumRow.put(k, new BigDecimal(v.toString())); if (NumberUtils.isCreatable(v.toString())) {
} sumRow.put(k, new BigDecimal(v.toString()));
}); }
});
}
if (sumRow != null) { if (sumRow != null) {
sumRow.put("taxAgentName", "总计"); sumRow.put("taxAgentName", "总计");
resultMapList.add(sumRow); resultMapList.add(sumRow);