Browse Source

feat(all): 修改配送明细报表逻辑

dist.1.3.0
zhaoqiaobo 6 months ago
parent
commit
a78c62bf63
  1. 9
      blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java

9
blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java

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

Loading…
Cancel
Save