From 101513bba8aebf122af037efe27cbe09c6cb1d2f Mon Sep 17 00:00:00 2001 From: jueyue Date: Thu, 23 Apr 2015 11:51:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dparams=20=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/ExcelExportOfTemplateUtil.java | 7 +++-- .../poi/test/entity/TeacherEntity.java | 2 +- .../excel/test/ExcelExportTemplateTest.java | 27 ++++++++++++------- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java index cd7a46e..fedff4d 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java @@ -82,9 +82,6 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase { // 获取实体对象的导出数据 List excelParams = new ArrayList(); getAllExcelField(null, targetId, fileds, excelParams, pojoClass, null); - if (excelParams.size() == 0) { - return; - } // 根据表头进行筛选排序 sortAndFilterExportField(excelParams, titlemap); short rowHeight = getRowHeight(excelParams); @@ -92,7 +89,9 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase { //下移数据,模拟插入 sheet.shiftRows(params.getHeadingRows() + params.getHeadingStartRow(), sheet.getLastRowNum(), getShiftRows(dataSet, excelParams), true, true); - + if (excelParams.size() == 0) { + return; + } Iterator its = dataSet.iterator(); while (its.hasNext()) { Object t = its.next(); diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/TeacherEntity.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/TeacherEntity.java index e2445a1..35cacab 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/TeacherEntity.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/TeacherEntity.java @@ -18,7 +18,7 @@ public class TeacherEntity implements java.io.Serializable { @Excel(name = "老师ID_teacherEntity,老师属性_courseEntity", orderNum = "2", needMerge = false) private String id; /** name */ - @Excel(name = "语文老师_yuwen,数学老师_shuxue", orderNum = "2", mergeVertical = true) + @Excel(name = "老师姓名_yuwen,数学老师_shuxue", orderNum = "2", mergeVertical = true) private String name; /* diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportTemplateTest.java b/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportTemplateTest.java index 34bb255..b1fce97 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportTemplateTest.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportTemplateTest.java @@ -23,19 +23,30 @@ public class ExcelExportTemplateTest { List list = new ArrayList(); CourseEntity courseEntity; - //@Test + @Test public void one() throws Exception { - TemplateExportParams params = new TemplateExportParams(); + TemplateExportParams params = new TemplateExportParams( + "org/jeecgframework/poi/test/excel/doc/exportTemp.xls", 0, 1); params.setHeadingRows(2); params.setHeadingStartRow(2); params.setStyle(ExcelStyleType.BORDER.getClazz()); Map map = new HashMap(); + //sheet 1 map.put("year", "2013"); map.put("sunCourses", list.size()); Map obj = new HashMap(); map.put("obj", obj); obj.put("name", list.size()); - params.setTemplateUrl("org/jeecgframework/poi/excel/doc/exportTemp.xls"); + // sheet 2 + map.put("month", 10); + Map temp; + for (int i = 1; i < 8; i++) { + temp = new HashMap(); + temp.put("per", i * 10); + temp.put("mon", i * 1000); + temp.put("summon", i * 10000); + map.put("i" + i, temp); + } Workbook book = ExcelExportUtil.exportExcel(params, CourseEntity.class, list, map); File savefile = new File("d:/"); if (!savefile.exists()) { @@ -78,9 +89,10 @@ public class ExcelExportTemplateTest { } } - @Test + //@Test public void two() throws Exception { - TemplateExportParams params = new TemplateExportParams(); + TemplateExportParams params = new TemplateExportParams( + "org/jeecgframework/poi/test/excel/doc/exportTemp.xls", 1); Map map = new HashMap(); map.put("month", 10); Map temp; @@ -91,9 +103,7 @@ public class ExcelExportTemplateTest { temp.put("summon", i * 10000); map.put("i" + i, temp); } - params.setTemplateUrl("org/jeecgframework/poi/test/excel/doc/exportTemp.xls"); - params.setSheetNum(new Integer[]{1}); - Workbook book = ExcelExportUtil.exportExcel(params, CourseEntity.class, list, map); + Workbook book = ExcelExportUtil.exportExcel(params, map); File savefile = new File("d:/"); if (!savefile.exists()) { savefile.mkdirs(); @@ -103,5 +113,4 @@ public class ExcelExportTemplateTest { fos.close(); } - }