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

冲突

This commit is contained in:
钱涛 2022-06-08 18:53:30 +08:00
parent b832910af9
commit 7f8d317846
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/engine/salary/wrapper/SalarySendWrapper.java
View File

@ -288,7 +288,7 @@ public class SalarySendWrapper extends Service {
if (queryParam.getSendStatus() != null) {
queryParam.setSendStatusVal(queryParam.getSendStatus().getValue());
}
PageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
PageInfo<SalarySendInfoListDTO> pageInfo = getSalarySendService(user).salarySendInfoListPage(queryParam);
List<SalarySendInfoListDTO> list = pageInfo.getList();
list.forEach(e -> {
@ -493,7 +493,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());
SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize());
// 2.获取基本数据
PageInfo<SalarySendDetailListDTO> pageInfo = getSalarySendService(user).salarySendInfoDetailListPage(queryParam);