diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/AsyncServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/AsyncServiceImpl.java index 5f0552320..630a26f66 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/AsyncServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/AsyncServiceImpl.java @@ -74,7 +74,8 @@ public class AsyncServiceImpl implements IAsyncService { // 当前第几次查询 int current = finalNum + 1; // 当前查询需要查询几条数据 - long lastNum = remaindNum > pageSize ? pageSize : remaindNum; + // long lastNum = remaindNum > pageSize ? pageSize : remaindNum; + long lastNum = pageSize; // 分页查询对象 Page page = new Page(current, lastNum); // 执行查询操作返回数据 diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java index e62f16a56..384a0cb55 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java @@ -196,7 +196,7 @@ public class ReportDeliverServiceImpl implements ReportDeliverService { trainCustomQuery(query, queryWrapper); // 仓库权限 ReportUtil.buildReportWarehouseAuth(vo.getWarehouseName(), query.getWarehouseNameRange(), queryWrapper, warehouseClient); - reportExcelUtil.export(response, deliveryTrainReader, ReportDevilerVO.class, queryWrapper, "配送车次维度报表",20L, ReportExcelUtil.SHEETDATANUM); + reportExcelUtil.export(response, deliveryTrainReader, ReportDevilerVO.class, queryWrapper, "配送车次维度报表",2000L, ReportExcelUtil.SHEETDATANUM); } @Override