报表排除掉未归档的数据
This commit is contained in:
parent
5e6a65e47e
commit
ec67c89e7d
|
|
@ -583,7 +583,25 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
|
|||
// lambdaQueryChainWrapper.in(SalaryAcctEmployeePO::getIncomeCategory, param.getIncomeCategory().stream().map(Object::toString).collect(Collectors.toList()));
|
||||
// }
|
||||
|
||||
List<SalaryAcctEmployeePO> list = getSalaryAcctEmployeeMapper().listSome(lambdaQueryChainWrapper);
|
||||
//排除未归档数据
|
||||
List<SalaryAcctRecordPO> salaryAcctRecordPOS = getSalaryAcctRecordService(user).listAll();
|
||||
List<Long> salaryAcctRecordIds = salaryAcctRecordPOS.stream()
|
||||
.filter(po -> !Objects.equals(po.getStatus(), SalaryAcctRecordStatusEnum.NOT_ARCHIVED.getValue()))
|
||||
.map(SalaryAcctRecordPO::getId)
|
||||
.collect(Collectors.toList());
|
||||
|
||||
List<SalaryAcctEmployeePO> list = new ArrayList<>();
|
||||
if (CollectionUtils.isNotEmpty(salaryAcctRecordIds)) {
|
||||
//分片查询
|
||||
List<List<Long>> partition = Lists.partition(salaryAcctRecordIds, 500);
|
||||
List<SalaryAcctEmployeePO> empList = new ArrayList<>();
|
||||
partition.forEach(part -> {
|
||||
lambdaQueryChainWrapper.setSalaryAcctRecordIds(salaryAcctRecordIds);
|
||||
empList.addAll(getSalaryAcctEmployeeMapper().listSome(lambdaQueryChainWrapper));
|
||||
});
|
||||
list = empList;
|
||||
}
|
||||
|
||||
if (CollectionUtils.isEmpty(list)) {
|
||||
return Lists.newArrayList();
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue