From 4528995e966fdaae8112129d0e98dbfcc534f2b3 Mon Sep 17 00:00:00 2001 From: jueyue Date: Mon, 29 Aug 2016 20:34:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=8F=92=E5=85=A5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jeecgframework/poi/excel/ExcelExportUtil.java | 4 ++-- .../jeecgframework/poi/excel/export/ExcelExportServer.java | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelExportUtil.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelExportUtil.java index 5cb86cd..d21038c 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelExportUtil.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelExportUtil.java @@ -55,7 +55,7 @@ public class ExcelExportUtil { Workbook workbook; if (ExcelType.HSSF.equals(entity.getType())) { workbook = new HSSFWorkbook(); - } else if (dataSet.size() < 1000) { + } else if (dataSet.size() < 10000) { workbook = new XSSFWorkbook(); } else { workbook = new SXSSFWorkbook(); @@ -78,7 +78,7 @@ public class ExcelExportUtil { Workbook workbook; if (ExcelType.HSSF.equals(entity.getType())) { workbook = new HSSFWorkbook(); - } else if (dataSet.size() < 1000) { + } else if (dataSet.size() < 10000) { workbook = new XSSFWorkbook(); } else { workbook = new SXSSFWorkbook(); diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java index 88a4d31..eda8460 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java @@ -153,6 +153,12 @@ public class ExcelExportServer extends ExcelExportBase { // 重复遍历,出现了重名现象,创建非指定的名称Sheet sheet = workbook.createSheet(); } + insertDataToSheet(workbook, entity, entityList, dataSet,sheet); + } + + private void insertDataToSheet(Workbook workbook, ExportParams entity, + List entityList, Collection dataSet, + Sheet sheet) { try { dataHanlder = entity.getDataHanlder(); if (dataHanlder != null && dataHanlder.getNeedHandlerFields() != null) {