Browse Source

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

dist.1.3.0
zhaoqiaobo 8 months ago
parent
commit
6f71f97ddc
  1. 2
      blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryDetailReader.java
  2. 3
      blade-service/logpm-report/src/main/java/com/logpm/report/util/ReportExcelUtil.java

2
blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryDetailReader.java

@ -38,7 +38,7 @@ public class DeliveryDetailReader implements ExportReader {
@Override @Override
public List<T> findList(Page page, Wrapper query) { public List<T> findList(Page page, Wrapper query) {
return asyncService.getdetailPages(page, query, Convert.toInt(page.getCurrent()), Convert.toInt(page.getTotal())); return asyncService.getdetailPages(page, query, Convert.toInt(page.getCurrent()), Convert.toInt(page.getSize()));
} }
} }

3
blade-service/logpm-report/src/main/java/com/logpm/report/util/ReportExcelUtil.java

@ -116,8 +116,6 @@ public class ReportExcelUtil {
int findNum = (int) Math.ceil((count / pageSize.doubleValue())); int findNum = (int) Math.ceil((count / pageSize.doubleValue()));
// 封装查询后需要导出的数据 // 封装查询后需要导出的数据
Map<Integer, List<Object>> pageMap = new ConcurrentHashMap<>(ReportConstants.HASHMAP_DEFAULT_SIZE); Map<Integer, List<Object>> pageMap = new ConcurrentHashMap<>(ReportConstants.HASHMAP_DEFAULT_SIZE);
// 定义线程池,大表导出使用一个线程池
ExecutorService executorService = ThreadPoolUtil.getThreadPool();
// 控制线程全部查询完后执行导出操作 // 控制线程全部查询完后执行导出操作
CountDownLatch countDownLatch = new CountDownLatch(findNum); CountDownLatch countDownLatch = new CountDownLatch(findNum);
ExcelWriter excelWriter = null; ExcelWriter excelWriter = null;
@ -128,7 +126,6 @@ public class ReportExcelUtil {
e.printStackTrace(); e.printStackTrace();
} }
int num = 0; int num = 0;
List<CompletableFuture<List>> futures = new ArrayList<>();
for (int i = 0; i < sheetNum; i++) { for (int i = 0; i < sheetNum; i++) {
// sheet编号 // sheet编号
int finalI = i + 1; int finalI = i + 1;

Loading…
Cancel
Save