|
|
|
@ -179,11 +179,10 @@ public class ReportDeliverServiceImpl implements ReportDeliverService {
|
|
|
|
|
double div = NumberUtil.div(zeroTotal, size.doubleValue()); |
|
|
|
|
long zeroCurrent = (int) Math.ceil(div) + 1; |
|
|
|
|
int zeroSize = zeroTotal % size; |
|
|
|
|
page.setCurrent(zeroCurrent); |
|
|
|
|
page.setSize(zeroSize); |
|
|
|
|
List<ReportDetailVO> zeroPage = reportDeliverMapeer.getDetailsZeroPage(page, queryWrapper); |
|
|
|
|
page.setCurrent(current); |
|
|
|
|
page.setSize(size); |
|
|
|
|
IPage<ReportDetailVO> page1 = Condition.getPage(query); |
|
|
|
|
page1.setCurrent(zeroCurrent); |
|
|
|
|
page1.setSize(zeroSize); |
|
|
|
|
List<ReportDetailVO> zeroPage = reportDeliverMapeer.getDetailsZeroPage(page1, queryWrapper); |
|
|
|
|
detailsPage.addAll(zeroPage); |
|
|
|
|
} |
|
|
|
|
page.setTotal(allTotal); |
|
|
|
|