From f386899a9e63a1c504516480aae98c76697a7315 Mon Sep 17 00:00:00 2001 From: jueyue Date: Tue, 23 Dec 2014 12:44:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=8D=95=E5=85=83=E6=A0=BC?= =?UTF-8?q?=E7=9A=84bug,=E6=96=B0=E5=A2=9E=E4=BA=86java.sql.time=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/export/base/ExcelExportBase.java | 24 ++++++++++--------- .../poi/entity/CourseEntity.java | 2 +- .../poi/entity/StudentEntity.java | 11 +++++++++ .../poi/excel/test/ExcelExportUtilIdTest.java | 3 ++- 4 files changed, 27 insertions(+), 13 deletions(-) diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExcelExportBase.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExcelExportBase.java index e7fa65b..f981f04 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExcelExportBase.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExcelExportBase.java @@ -41,13 +41,13 @@ import org.jeecgframework.poi.util.POIPublicUtil; */ public abstract class ExcelExportBase extends ExportBase { - private int currentIndex = 0; + private int currentIndex = 0; - protected String type = PoiBaseConstants.HSSF; + protected String type = PoiBaseConstants.HSSF; - private Map statistics = new HashMap(); - - private static final DecimalFormat DOUBLE_FORMAT = new DecimalFormat("######0.00"); + private Map statistics = new HashMap(); + + private static final DecimalFormat DOUBLE_FORMAT = new DecimalFormat("######0.00"); private boolean checkIsEqualByCellContents(MergeEntity mergeEntity, String text, Cell cell, int[] delys, int rowNum) { @@ -273,13 +273,15 @@ public abstract class ExcelExportBase extends ExportBase { * @param sheet */ public void addStatisticsRow(CellStyle styles, Sheet sheet) { - Row row = sheet.createRow(sheet.getLastRowNum() + 1); - Set keys = statistics.keySet(); - createStringCell(row, 0, "合计", styles, null); - for (Integer key : keys) { - createStringCell(row, key, DOUBLE_FORMAT.format(statistics.get(key)), styles, null); + if (statistics.size() > 0) { + Row row = sheet.createRow(sheet.getLastRowNum() + 1); + Set keys = statistics.keySet(); + createStringCell(row, 0, "合计", styles, null); + for (Integer key : keys) { + createStringCell(row, key, DOUBLE_FORMAT.format(statistics.get(key)), styles, null); + } + statistics.clear(); } - statistics.clear(); } diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/entity/CourseEntity.java b/easypoi-test/src/main/java/org/jeecgframework/poi/entity/CourseEntity.java index cd7b678..0c2680f 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/entity/CourseEntity.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/entity/CourseEntity.java @@ -32,7 +32,7 @@ public class CourseEntity implements java.io.Serializable { //@ExcelEntity(id = "shuxue") private TeacherEntity shuxueteacher; - //@ExcelCollection(name = "选课学生", orderNum = "4") + @ExcelCollection(name = "选课学生", orderNum = "4") private List students; /** diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/entity/StudentEntity.java b/easypoi-test/src/main/java/org/jeecgframework/poi/entity/StudentEntity.java index 13464ff..afc4ef2 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/entity/StudentEntity.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/entity/StudentEntity.java @@ -30,6 +30,9 @@ public class StudentEntity implements java.io.Serializable { @Excel(name = "出生日期", databaseFormat = "yyyyMMddHHmmss", exportFormat = "yyyy-MM-dd", mergeVertical = true) private Date birthday; + + @Excel(name = "进校日期", databaseFormat = "yyyyMMddHHmmss", exportFormat = "yyyy-MM-dd") + private java.sql.Time registrationDate; /** * 课程主键 */ @@ -105,4 +108,12 @@ public class StudentEntity implements java.io.Serializable { this.birthday = birthday; } + public java.sql.Time getRegistrationDate() { + return registrationDate; + } + + public void setRegistrationDate(java.sql.Time registrationDate) { + this.registrationDate = registrationDate; + } + } diff --git a/easypoi-test/src/main/java/org/jeecgframework/poi/excel/test/ExcelExportUtilIdTest.java b/easypoi-test/src/main/java/org/jeecgframework/poi/excel/test/ExcelExportUtilIdTest.java index 1366a20..9267843 100644 --- a/easypoi-test/src/main/java/org/jeecgframework/poi/excel/test/ExcelExportUtilIdTest.java +++ b/easypoi-test/src/main/java/org/jeecgframework/poi/excel/test/ExcelExportUtilIdTest.java @@ -50,6 +50,7 @@ public class ExcelExportUtilIdTest { studentEntity.setId("11231"); studentEntity.setName("撒旦法司法局"); studentEntity.setBirthday(new Date()); + studentEntity.setRegistrationDate(new java.sql.Time(new Date().getTime())); studentEntity.setSex(1); List studentList = new ArrayList(); studentList.add(studentEntity); @@ -70,7 +71,7 @@ public class ExcelExportUtilIdTest { public void testExportExcel() throws Exception { ExportParams params = new ExportParams("2412312", "测试", "测试"); params.setAddIndex(true); - Workbook workbook = ExcelExportUtil.exportExcel(params, TeacherEntity.class, telist); + Workbook workbook = ExcelExportUtil.exportExcel(params, CourseEntity.class, list); FileOutputStream fos = new FileOutputStream("d:/tt.xls"); workbook.write(fos); fos.close();