|
|
@ -178,11 +178,15 @@ public class ReportDeliverServiceImpl implements ReportDeliverService { |
|
|
|
// 剩余需要查询的数量
|
|
|
|
// 剩余需要查询的数量
|
|
|
|
int zeroTotal = Convert.toInt(pageSize - total); |
|
|
|
int zeroTotal = Convert.toInt(pageSize - total); |
|
|
|
double div = NumberUtil.div(zeroTotal, size.doubleValue()); |
|
|
|
double div = NumberUtil.div(zeroTotal, size.doubleValue()); |
|
|
|
long zeroCurrent = (int) Math.ceil(div) + 1; |
|
|
|
long zeroCurrent = (int) Math.ceil(div); |
|
|
|
int zeroSize = zeroTotal % size; |
|
|
|
int zeroSize = zeroTotal % size; |
|
|
|
IPage<ReportDetailVO> page1 = Condition.getPage(query); |
|
|
|
IPage<ReportDetailVO> page1 = Condition.getPage(query); |
|
|
|
page1.setCurrent(zeroCurrent); |
|
|
|
page1.setCurrent(zeroCurrent); |
|
|
|
|
|
|
|
if (ObjectUtil.equals(zeroCurrent, 1)) { |
|
|
|
page1.setSize(zeroSize); |
|
|
|
page1.setSize(zeroSize); |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
page1.setSize(size); |
|
|
|
|
|
|
|
} |
|
|
|
List<ReportDetailVO> zeroPage = reportDeliverMapeer.getDetailsZeroPage(page1, queryWrapper); |
|
|
|
List<ReportDetailVO> zeroPage = reportDeliverMapeer.getDetailsZeroPage(page1, queryWrapper); |
|
|
|
detailsPage.addAll(zeroPage); |
|
|
|
detailsPage.addAll(zeroPage); |
|
|
|
} |
|
|
|
} |
|
|
|