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

Merge remote-tracking branch 'origin/release/2.8.3.2306.01' into release/2.8.3.2306.01

This commit is contained in:
Harryxzy 2023-06-09 09:49:22 +08:00
parent 5bee0f3b4d 892f99052b
commit 849ea1e2d0
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
View File

@ -245,6 +245,7 @@ public class SalaryStatisticsReportWrapper extends Service {
resultMap.put("columns", weaTableColumns);
resultMap.put("pageInfo", page);
resultMap.put("countResult", countResultMap);
resultMap.put("reportId", param.getId());
return resultMap;
}

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

@ -101,12 +101,6 @@ public class SalaryAcctResultWrapper extends Service {
datas.put("pageInfo", page);
datas.put("columns", columns);
// //合计
// SalarySysConfPO openSum = getSalarySysConfService(user).getOneByCode(OPEN_ACCT_RESULT_SUM);
// if (openSum != null && StringUtils.isNotBlank(openSum.getConfValue()) && OpenEnum.parseByValue(openSum.getConfValue()) == OpenEnum.OPEN) {
// Map<String, Object> sumRow = getSalaryAcctResultService(user).sumRow(queryParam);
// datas.put("sumRow", sumRow);
// }
return datas;
}