工资单部分分页调整
This commit is contained in:
parent
ddc4edd918
commit
3a1ac7ca93
|
|
@ -277,6 +277,7 @@ public class SalarySendWrapper extends Service {
|
|||
if (queryParam.getSendStatus() != null) {
|
||||
queryParam.setSendStatusVal(queryParam.getSendStatus().getValue());
|
||||
}
|
||||
PageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
|
||||
PageInfo<SalarySendInfoListDTO> pageInfo = getSalarySendService(user).salarySendInfoListPage(queryParam);
|
||||
List<SalarySendInfoListDTO> list = pageInfo.getList();
|
||||
list.forEach(e -> {
|
||||
|
|
@ -481,6 +482,7 @@ public class SalarySendWrapper extends Service {
|
|||
List<SalaryTemplatePO> salaryTemplates = getSalaryTemplateService(user).getDefaultTemplates(Collections.singletonList(salarySend.getSalarySobId()));
|
||||
List<SalaryTemplateSalaryItemListDTO> salaryItems = getSalarySendService(user).getSalaryItemsSetting(CollectionUtils.isNotEmpty(salaryTemplates) ? salaryTemplates.get(0) : null);
|
||||
|
||||
PageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
|
||||
// 2.获取基本数据
|
||||
PageInfo<SalarySendDetailListDTO> pageInfo = getSalarySendService(user).salarySendInfoDetailListPage(queryParam);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue