diff --git a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java index 9f0e39f50..80c34ac03 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java @@ -318,7 +318,7 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct Set keySet = SalaryEntityUtil.properties(salaryAcctEmployeePOS, salaryAcctEmployeePO -> salaryAcctEmployeePO.getEmployeeId() + "-" + salaryAcctEmployeePO.getTaxAgentId()); // 上个月的核算人员 queryParam.setSalaryAcctRecordId(null); - queryParam.setSalaryAcctRecordIds(lastMonthSalaryAcctRecordIds); + queryParam.setSalaryAcctRecordIds(lastMonthSalaryAcctRecordIds.stream().collect(Collectors.toList())); List lastMonthSalaryAcctEmployeePOS = listByParam(queryParam); Map lastMonthSalaryAcctEmployeePOMap = SalaryEntityUtil.convert2Map(lastMonthSalaryAcctEmployeePOS, salaryAcctEmployeePO -> salaryAcctEmployeePO.getEmployeeId() + "-" + salaryAcctEmployeePO.getTaxAgentId()); diff --git a/src/com/engine/salary/sys/constant/SalarySysConstant.java b/src/com/engine/salary/sys/constant/SalarySysConstant.java index 3134d99c7..7ae030026 100644 --- a/src/com/engine/salary/sys/constant/SalarySysConstant.java +++ b/src/com/engine/salary/sys/constant/SalarySysConstant.java @@ -206,10 +206,6 @@ public class SalarySysConstant { public static final String APPROVAL_CAN_EDIT_RESULT_STATUS = "APPROVAL_CAN_EDIT_RESULT_STATUS"; - /** - * 报表是否开启缓存,0:关闭 1:开启 - */ - public static final String REPORT_CACHE = "REPORT_CACHE"; /** * 是否采用组织快照,0:关闭 1:开启 @@ -232,8 +228,5 @@ public class SalarySysConstant { * 默认薪资所属月 */ public static final String TAX_DECLARATION_DATE_TYPE = "TAX_DECLARATION_DATE_TYPE"; - /** - * 薪资明细页面显示类型 - */ - public static final String SALARY_DETAILS_REPORT_SHOW_TYPE = "SALARY_DETAILS_REPORT_SHOW_TYPE"; + }