Browse Source

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

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

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

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

Loading…
Cancel
Save