From 3c3d8b787c5c0a2e788ec0186e2c6258857279f4 Mon Sep 17 00:00:00 2001 From: zhuhuawu Date: Fri, 29 Jul 2016 11:59:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecgframework/poi/excel/export/ExcelExportServer.java | 1 + .../jeecgframework/poi/excel/export/base/ExcelExportBase.java | 1 + .../org/jeecgframework/poi/excel/export/base/ExportBase.java | 1 + 3 files changed, 3 insertions(+) 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..82b7fdd 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 @@ -75,6 +75,7 @@ public class ExcelExportServer extends ExcelExportBase { */ public int createHeaderRow(ExportParams entity, Sheet sheet, Workbook workbook, int feildWidth) { + Row row = sheet.createRow(0); row.setHeight(entity.getTitleHeight()); createStringCell(row, 0, entity.getTitle(), 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 5e599c3..78284b1 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 @@ -364,6 +364,7 @@ public abstract class ExcelExportBase extends ExportBase { } else if (type.equalsIgnoreCase("PNG")) { return Workbook.PICTURE_TYPE_PNG; } + return Workbook.PICTURE_TYPE_JPEG; } diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExportBase.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExportBase.java index 49df917..c4d0c0c 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExportBase.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExportBase.java @@ -115,6 +115,7 @@ public class ExportBase { } // 首先判断Excel 可能一下特殊数据用户回自定义处理 if (field.getAnnotation(Excel.class) != null) { + Excel excel = field.getAnnotation(Excel.class); String name=PoiPublicUtil.getValueByTargetId(excel.name(), targetId, null); if(StringUtils.isNotBlank(name)){