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

报表缓存时参数变更问题

This commit is contained in:
钱涛 2023-06-27 16:18:42 +08:00
parent abd8431d49
commit 89ae0dc786
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/engine/salary/report/entity/po/SalaryStatisticsItemPO.java
View File

@ -1,10 +1,7 @@
package com.engine.salary.report.entity.po;
import com.engine.salary.report.enums.UnitTypeEnum;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.*;
import java.io.Serializable;
import java.util.Collection;
@ -14,6 +11,7 @@ import java.util.Date;
@Builder
@NoArgsConstructor
@AllArgsConstructor
@ToString
//hrsa_salary_statistics_item")
//薪酬报表统计子表自定义统计项")
public class SalaryStatisticsItemPO implements Serializable {

2
src/com/engine/salary/report/service/impl/SalaryStatisticsItemServiceImpl.java
View File

@ -46,7 +46,7 @@ public class SalaryStatisticsItemServiceImpl extends Service implements SalarySt
@Override
public List<SalaryStatisticsItemPO> listByStatisticsReportId(Long statisticsReportId) {
if (statisticsReportId == null) {
return null;
return new ArrayList<>();
}
return getSalaryStatisticsItemMapper().listSome(SalaryStatisticsItemPO.builder().statReportId(statisticsReportId).build());
}

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

@ -260,11 +260,12 @@ public class SalaryStatisticsReportWrapper extends Service {
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(161845, "薪酬统计报表不存在"));
}
// 查询自定义统计项目
List<SalaryStatisticsItemPO> salaryStatisticsItemList = this.getSalaryStatisticsItemService(user).listByStatisticsReportId(po.getId());
// 参数转换
SalaryStatisticsReportBO.poToQueryParam(param, po);
String paramMd5 = SecureUtil.md5(param.toString());
String paramMd5 = SecureUtil.md5(param + salaryStatisticsItemList.toString());
//已缓存的报表id
String salaryReportIds = Utils.null2String(getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_IDS));
@ -278,8 +279,6 @@ public class SalaryStatisticsReportWrapper extends Service {
}
// 查询自定义统计项目
List<SalaryStatisticsItemPO> salaryStatisticsItemList = this.getSalaryStatisticsItemService(user).listByStatisticsReportId(po.getId());
// 列表data
PageInfo<Map<String, Object>> page = this.getSalaryStatisticsReportService(user).buildReportRecords(dimension, param, salaryStatisticsItemList);