diff --git a/easypoi-annotation/src/main/java/org/jeecgframework/poi/excel/annotation/Excel.java b/easypoi-annotation/src/main/java/org/jeecgframework/poi/excel/annotation/Excel.java index 365f754..2583329 100644 --- a/easypoi-annotation/src/main/java/org/jeecgframework/poi/excel/annotation/Excel.java +++ b/easypoi-annotation/src/main/java/org/jeecgframework/poi/excel/annotation/Excel.java @@ -32,7 +32,7 @@ public @interface Excel { /** * 导出时在excel中每个列的高度 单位为字符,一个汉字=2个字符 */ - public int height() default 10; + public double height() default 10; /** * 导出类型 1 从file读取 2 是从数据库中读取 默认是文件 同样导入也是一样的 @@ -100,7 +100,7 @@ public @interface Excel { * 导出时在excel中每个列的宽 单位为字符,一个汉字=2个字符 如 以列名列内容中较合适的长度 例如姓名列6 【姓名一般三个字】 * 性别列4【男女占1,但是列标题两个汉字】 限制1-255 */ - public int width() default 10; + public double width() default 10; /** * 是否自动统计数据,如果是统计,true的话在最后追加一行统计,把所有数据都和 diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/params/ExcelExportEntity.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/params/ExcelExportEntity.java index ee7c328..52ac983 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/params/ExcelExportEntity.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/params/ExcelExportEntity.java @@ -15,9 +15,9 @@ public class ExcelExportEntity extends ExcelBaseEntity implements Comparable list = excelParams.get(i).getList(); for (int j = 0; j < list.size(); j++) { - sheet.setColumnWidth(index, 256 * list.get(j).getWidth()); + sheet.setColumnWidth(index, (int) (256 * list.get(j).getWidth())); index++; } } else { - sheet.setColumnWidth(index, 256 * excelParams.get(i).getWidth()); + sheet.setColumnWidth(index, (int) (256 * excelParams.get(i).getWidth())); index++; } } 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 84cfb2f..efa525e 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 @@ -271,7 +271,7 @@ public class ExportBase { * @return */ public short getRowHeight(List excelParams) { - int maxHeight = 0; + double maxHeight = 0; for (int i = 0; i < excelParams.size(); i++) { maxHeight = maxHeight > excelParams.get(i).getHeight() ? maxHeight : excelParams.get(i) .getHeight(); 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 baa6405..ad3869a 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 @@ -81,10 +81,10 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase { .newInstance(workbook)); // 获取实体对象的导出数据 List excelParams = new ArrayList(); + getAllExcelField(null, targetId, fileds, excelParams, pojoClass, null); if (excelParams.size() == 0) { return; } - getAllExcelField(null, targetId, fileds, excelParams, pojoClass, null); // 根据表头进行筛选排序 sortAndFilterExportField(excelParams, titlemap); short rowHeight = getRowHeight(excelParams);