Commit daba3f95 authored by 韩桐桐's avatar 韩桐桐

fix(jg):汇总表下载分批异步bug,汇总表页面字体调小,尽可能展示多的信息

parent 5a262fde
......@@ -2430,15 +2430,17 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
List<CompletableFuture<byte[]>> futures = IntStream.rangeClosed(1, page)
.mapToObj(current -> CompletableFuture.supplyAsync(() -> {
exportParamsMap.put("current", current);
// 创建独立的参数副本
Map<String, Object> currentExportParamsMap = new HashMap<>(exportParamsMap);
currentExportParamsMap.put("current", current);
// 数据分页
int start = (current - 1) * size;
int end = ((current - 1) * size + size) < total ? (current - 1) * size + size : (int) total;
// 数据截取
List<Object> equData = equipmentLists.subList(start, end);
// 设备数据填充
this.pressurePipeEquData(exportParamsMap, equData, current, size);
return commonService.generateSummaryOfCylinderInfo(exportParamsMap, wordPath, filePrefix);
this.pressurePipeEquData(currentExportParamsMap, equData, current, size);
return commonService.generateSummaryOfCylinderInfo(currentExportParamsMap, wordPath, filePrefix);
})).collect(Collectors.toList());
CompletableFuture.allOf(futures.toArray(new CompletableFuture[page])).join();
return futures;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment