大屏二级页面分页
This commit is contained in:
parent
763746b314
commit
a1669a3e08
|
|
@ -169,23 +169,28 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
|
||||||
@Override
|
@Override
|
||||||
public PageResultVo getAcceptanceDetailStorage(ParamsDto dto) {
|
public PageResultVo getAcceptanceDetailStorage(ParamsDto dto) {
|
||||||
extracted(dto);
|
extracted(dto);
|
||||||
// 分页
|
List<StorageDetailVo> result = mapper.getAcceptanceDetailStorage(dto);
|
||||||
PageHelper.startPage(dto.getPageNum() == 0 ? 1 : dto.getPageNum(), dto.getPageSize());
|
List<StorageDetailVo> filteredResult = result.stream()
|
||||||
PageResultVo pageResult = new PageResultVo();
|
|
||||||
List<StorageDetailVo> result;
|
|
||||||
result = mapper.getAcceptanceDetailStorage(dto);
|
|
||||||
result = result.stream()
|
|
||||||
.filter(storageDetail -> storageDetail.getPurchaseNum() != 0 ||
|
.filter(storageDetail -> storageDetail.getPurchaseNum() != 0 ||
|
||||||
storageDetail.getCheckNum() != 0 ||
|
storageDetail.getCheckNum() != 0 ||
|
||||||
storageDetail.getInputNum() != 0)
|
storageDetail.getInputNum() != 0)
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
// 分页信息
|
// 手动计算分页信息
|
||||||
PageInfo<StorageDetailVo> pageInfo = new PageInfo<>(result);
|
int pageNum = dto.getPageNum() == 0 ? 1 : dto.getPageNum();
|
||||||
pageResult.setTotal(pageInfo.getTotal());
|
int pageSize = dto.getPageSize();
|
||||||
pageResult.setTotalPageCount(pageInfo.getPages());
|
int total = filteredResult.size();
|
||||||
pageResult.setRows(result);
|
int totalPages = (int) Math.ceil((double) total / pageSize);
|
||||||
pageResult.setPageNum (dto.getPageNum());
|
// 手动分页,获取当前页的数据
|
||||||
pageResult.setPageSize(dto.getPageSize());
|
int startIndex = (pageNum - 1) * pageSize;
|
||||||
|
int endIndex = Math.min(startIndex + pageSize, total);
|
||||||
|
List<StorageDetailVo> currentPageData = filteredResult.subList(startIndex, endIndex);
|
||||||
|
// 构建返回结果对象
|
||||||
|
PageResultVo pageResult = new PageResultVo();
|
||||||
|
pageResult.setTotal(total);
|
||||||
|
pageResult.setTotalPageCount(totalPages);
|
||||||
|
pageResult.setRows(currentPageData);
|
||||||
|
pageResult.setPageNum(pageNum);
|
||||||
|
pageResult.setPageSize(pageSize);
|
||||||
return pageResult;
|
return pageResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue