diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/ExcelBaseParams.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/ExcelBaseParams.java index 067c199..1aa38a8 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/ExcelBaseParams.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/ExcelBaseParams.java @@ -22,6 +22,7 @@ import org.jeecgframework.poi.handler.inter.IExcelDataHandler; * @author JueYue * @date 2014年6月20日 下午1:56:52 */ +@SuppressWarnings("rawtypes") public class ExcelBaseParams { /** 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 c8dd5c0..f84fcfa 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 @@ -462,7 +462,7 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase { try { row.getCell(ci).setCellValue(val); } catch (Exception e) { - LOGGER.error(e.getMessage(),e); + LOGGER.error(e.getMessage(), e); } } row.getCell(ci).setCellStyle(columns.get(i).getCellStyle()); @@ -520,7 +520,14 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase { int startIndex = cell.getColumnIndex(); Row row = cell.getRow(); while (true) { - index += 1; + int colSpan = columns.get(columns.size() - 1) != null + ? columns.get(columns.size() - 1).getColspan() : 1; + index += columns.get(columns.size() - 1).getColspan(); + for (int i = 1; i < colSpan; i++) { + //添加跳过的数据 + columns.add(null); + continue; + } cell = row.getCell(index); //可能是合并的单元格 if (cell == null) { @@ -564,9 +571,9 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase { } colspan = 0; for (int i = 0; i < columns.size(); i++) { - colspan += columns.get(i).getColspan(); + colspan += columns.get(i) != null ? columns.get(i).getColspan() : 0; } - colspan = colspan/rowspan; + colspan = colspan / rowspan; return new Object[] { rowspan, colspan, columns }; } diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/ExcelToHtmlServer.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/ExcelToHtmlServer.java index 6ac4c27..0c6a162 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/ExcelToHtmlServer.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/ExcelToHtmlServer.java @@ -72,7 +72,6 @@ public class ExcelToHtmlServer { public String printPage() { try { - System.out.println("--来了一次请求--"); ensureOut(); if (completeHTML) { out.format("%n"); diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiPublicUtil.java b/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiPublicUtil.java index 598c006..0187989 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiPublicUtil.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiPublicUtil.java @@ -178,7 +178,7 @@ public final class PoiPublicUtil { } return sheetIndexPicMap; } else { - return null; + return sheetIndexPicMap; } } diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/word/parse/ParseWord07.java b/easypoi-base/src/main/java/org/jeecgframework/poi/word/parse/ParseWord07.java index 57820ae..d004a95 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/word/parse/ParseWord07.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/word/parse/ParseWord07.java @@ -119,7 +119,7 @@ public class ParseWord07 { text = text.replace(FOREACH_NOT_CREATE, EMPTY).replace(FOREACH_AND_SHIFT, EMPTY) .replace(FOREACH, EMPTY).replace(START_STR, EMPTY); String[] keys = text.replaceAll("\\s{1,}", " ").trim().split(" "); - return (Collection) PoiPublicUtil.getParamsValue(keys[0], map); + return PoiPublicUtil.getParamsValue(keys[0], map); } return null; }