|
|
@@ -45,7 +45,7 @@ public class SplitRecordServiceImpl extends MyBaseServiceImpl<SplitRecordMapper,
|
|
|
CommUtil.isNotEmptyAndNull(adminStationIds)) {
|
|
|
params.setStationId(adminStationIds.get(0));
|
|
|
}
|
|
|
- PageHelper.startPage(params.getPageNum(), params.getPageSize());
|
|
|
+ var page = PageHelper.startPage(params.getPageNum(), params.getPageSize());
|
|
|
|
|
|
var queryWrapper = lambdaQuery()
|
|
|
.like(CommUtil.isNotEmptyAndNull(params.getTradeNo()), SplitRecord::getTradeNo, params.getTradeNo())
|
|
|
@@ -59,7 +59,6 @@ public class SplitRecordServiceImpl extends MyBaseServiceImpl<SplitRecordMapper,
|
|
|
|
|
|
var res = queryWrapper.orderByDesc(SplitRecord::getId).list();
|
|
|
|
|
|
- PageInfo<SplitRecord> pages = new PageInfo<>(res);
|
|
|
var voList = res.stream().map(item -> {
|
|
|
var vo = new SplitRecordVo();
|
|
|
BeanUtils.copyProperties(item, vo);
|
|
|
@@ -68,10 +67,10 @@ public class SplitRecordServiceImpl extends MyBaseServiceImpl<SplitRecordMapper,
|
|
|
return vo;
|
|
|
}).toList();
|
|
|
PageBean<SplitRecordVo> bean = new PageBean<>(voList);
|
|
|
- bean.setPages(pages.getPages());
|
|
|
- bean.setPageNum(pages.getPageNum());
|
|
|
- bean.setPageSize(pages.getPageSize());
|
|
|
- bean.setTotal(pages.getTotal());
|
|
|
+ bean.setPages(page.getPages());
|
|
|
+ bean.setPageNum(page.getPageNum());
|
|
|
+ bean.setPageSize(page.getPageSize());
|
|
|
+ bean.setTotal(page.getTotal());
|
|
|
return bean;
|
|
|
}
|
|
|
|