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

报表快照

This commit is contained in:
钱涛 2024-10-09 14:59:33 +08:00
parent a40188659f
commit 3a128a4c5b
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -332,28 +332,28 @@ public class SalaryStatisticsReportWrapper extends Service {
if (empDimensionOptional.isPresent()) {
empDimensionId = empDimensionOptional.get();
}
// if (StringUtils.isNotBlank(salaryReportIds) && salaryReportIds.contains(id + "")) {
// //报表中缓存的条件
// salaryReportConditions = Utils.null2String(getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_CONDITIONS + id));
// if (StringUtils.isNotBlank(salaryReportConditions) && salaryReportConditions.contains(paramMd5)) {
// Map<String, Object> result = getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_DATA + id + "_" + paramMd5);
// if (param.getDimensionId().equals(empDimensionId)) {
// // 人员维度需要分页
// Map<String, Object> finalResultMap = new HashMap<>();
// PageInfo<Map<String, Object>> pageInfo = (PageInfo<Map<String, Object>>) result.get("pageInfo");
// PageInfo<Map<String, Object>> finalPageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize());
// finalPageInfo.setTotal(pageInfo.getList().size());
// finalPageInfo.setList(SalaryPageUtil.subList(param.getCurrent(), param.getPageSize(), pageInfo.getList()));
// finalResultMap.put("pageInfo", finalPageInfo);
// finalResultMap.put("columns", result.get("columns"));
// finalResultMap.put("countResult", result.get("countResult"));
// finalResultMap.put("reportId", id);
// return finalResultMap;
// }
//
// return result;
// }
// }
if (StringUtils.isNotBlank(salaryReportIds) && salaryReportIds.contains(id + "")) {
//报表中缓存的条件
salaryReportConditions = Utils.null2String(getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_CONDITIONS + id));
if (StringUtils.isNotBlank(salaryReportConditions) && salaryReportConditions.contains(paramMd5)) {
Map<String, Object> result = getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_DATA + id + "_" + paramMd5);
if (param.getDimensionId().equals(empDimensionId)) {
// 人员维度需要分页
Map<String, Object> finalResultMap = new HashMap<>();
PageInfo<Map<String, Object>> pageInfo = (PageInfo<Map<String, Object>>) result.get("pageInfo");
PageInfo<Map<String, Object>> finalPageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize());
finalPageInfo.setTotal(pageInfo.getList().size());
finalPageInfo.setList(SalaryPageUtil.subList(param.getCurrent(), param.getPageSize(), pageInfo.getList()));
finalResultMap.put("pageInfo", finalPageInfo);
finalResultMap.put("columns", result.get("columns"));
finalResultMap.put("countResult", result.get("countResult"));
finalResultMap.put("reportId", id);
return finalResultMap;
}
return result;
}
}
// 列表data