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

修复数据推送查询问题

This commit is contained in:
钱涛 2025-04-24 17:35:22 +08:00
parent 99f6c43f25
commit 508012c82b
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/com/engine/salary/service/impl/PushServiceImpl.java
View File

@ -112,16 +112,16 @@ public class PushServiceImpl extends Service implements PushService {
Map<Long, SalarySobPO> sobPOMap = SalaryEntityUtil.convert2Map(salarySobPOS, SalarySobPO::getId); Map<Long, SalarySobPO> sobPOMap = SalaryEntityUtil.convert2Map(salarySobPOS, SalarySobPO::getId);
List<PushSettingDTO> list = pushSettingPOS.stream() List<PushSettingDTO> list = pushSettingPOS.stream()
.filter(po -> StrUtil.isBlank(param.getName()) || po.getName().contains(param.getName())).map( .filter(po -> StrUtil.isBlank(param.getName()) || po.getName().contains(param.getName()))
po -> PushSettingDTO.builder() .map(po -> PushSettingDTO.builder()
.id(po.getId()) .id(po.getId())
.name(po.getName()) .name(po.getName())
.tableName(po.getTableName()) .tableName(po.getTableName())
.modeName(po.getModeName()) .modeName(po.getModeName())
.modeId(po.getModeId()) .modeId(po.getModeId())
.able(po.getAble()) .able(po.getAble())
.salarySobs(po.getSalarySobIds().stream().map(sobPOMap::get).collect(Collectors.toList())) .salarySobs(po.getSalarySobIds().stream().map(sobPOMap::get).collect(Collectors.toList()))
.build()).collect(Collectors.toList()); .build()).collect(Collectors.toList());
return SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), list, PushSettingDTO.class); return SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), list, PushSettingDTO.class);
} }
@ -526,8 +526,9 @@ public class PushServiceImpl extends Service implements PushService {
@Override @Override
public PageInfo<PushRecordDTO> recordList(RecordListQueryParam param) { public PageInfo<PushRecordDTO> recordList(RecordListQueryParam param) {
List<PushRecordPO> pushRecordPOS = getPushRecordMapper().listAll(); List<PushRecordPO> pushRecordPOS = getPushRecordMapper().listAll();
List<PushRecordDTO> listDTOS = SalaryPageUtil.subList(param.getCurrent(), param.getPageSize(), pushRecordPOS) List<PushRecordDTO> listDTOS = pushRecordPOS
.stream() .stream()
.filter(po -> StrUtil.isBlank(param.getName()) || po.getName().contains(param.getName()))
.map(po -> PushRecordDTO.builder() .map(po -> PushRecordDTO.builder()
.id(po.getId()) .id(po.getId())
.name(po.getName()) .name(po.getName())
@ -544,7 +545,6 @@ public class PushServiceImpl extends Service implements PushService {
.collect(Collectors.toList()); .collect(Collectors.toList());
PageInfo<PushRecordDTO> pageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), listDTOS, PushRecordDTO.class); PageInfo<PushRecordDTO> pageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), listDTOS, PushRecordDTO.class);
pageInfo.setTotal(pushRecordPOS.size());
return pageInfo; return pageInfo;
} }