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

薪酬系统-福利档案，福利档案基数调整记录列表查询入参调整

This commit is contained in:
sy 2023-10-23 18:07:37 +08:00
parent 96bc325b43
commit 1c0b00d163
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/entity/siarchives/param/SIArchiveBaseHistoryListParam.java
View File

@ -23,6 +23,6 @@ public class SIArchiveBaseHistoryListParam {
private Long operator;
private Long paymentOrganization;
private int pageNum;
private int current;
private int pageSize;
}

4
src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
View File

@ -1148,7 +1148,7 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService
List<InsuranceArchivesBaseHistoryDTO> targetHistory = adjustHistoryDTOS.stream()
.filter(f -> f.getWelfareType().equals(param.getWelfareTypeEnum().getValue())).collect(Collectors.toList());
PageInfo<InsuranceArchivesBaseHistoryDTO> listPage = SalaryPageUtil.buildPage(param.getPageNum(), param.getPageSize(),
PageInfo<InsuranceArchivesBaseHistoryDTO> listPage = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(),
targetHistory , InsuranceArchivesBaseHistoryDTO.class);
return listPage;
@ -1159,7 +1159,7 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService
List<InsuranceArchivesBaseHistoryDTO> adjustHistoryDTOS = siArchivesBiz.getBaseHistoryByEmployeeIdAndOperator(param.getOperator(), param.getEmployeeId());
PageInfo<InsuranceArchivesBaseHistoryDTO> listPage = SalaryPageUtil.buildPage(param.getPageNum(), param.getPageSize(),
PageInfo<InsuranceArchivesBaseHistoryDTO> listPage = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(),
adjustHistoryDTOS , InsuranceArchivesBaseHistoryDTO.class);
return listPage;