From 0badfd2a407ed78ad9743d61947ff99f7b65601e Mon Sep 17 00:00:00 2001 From: jueyue Date: Wed, 20 Jan 2016 14:31:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=B3=A8=E9=87=8A=E9=97=AE?= =?UTF-8?q?=E9=A2=98,=E7=B4=A7=E6=80=A5=E4=BF=AE=E5=A4=8D=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E6=A8=A1=E6=9D=BF=E5=AF=BC=E5=87=BA=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../poi/excel/ExcelExportUtil.java | 1 + .../excel/entity/params/ExcelBaseEntity.java | 1 - .../poi/excel/export/ExcelExportServer.java | 2 +- .../template/ExcelExportOfTemplateUtil.java | 22 +++++++++---------- .../graph/builder/ExcelChartBuildService.java | 1 - .../poi/excel/html/ExcelToHtmlServer.java | 2 +- .../poi/excel/imports/CellValueServer.java | 2 +- .../poi/excel/imports/ExcelImportServer.java | 1 - .../excel/imports/sax/parse/SaxRowRead.java | 5 ++--- .../poi/pdf/export/PdfExportServer.java | 4 ++-- .../jeecgframework/poi/util/PoiElUtil.java | 2 +- .../poi/word/parse/ParseWord07.java | 6 ++--- .../word/parse/excel/ExcelEntityParse.java | 1 - 13 files changed, 22 insertions(+), 28 deletions(-) diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelExportUtil.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelExportUtil.java index a5474d5..5cb86cd 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelExportUtil.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelExportUtil.java @@ -123,6 +123,7 @@ public class ExcelExportUtil { * 模板集合 * @return */ + @Deprecated public static Workbook exportExcel(TemplateExportParams params, Class pojoClass, Collection dataSet, Map map) { return new ExcelExportOfTemplateUtil().createExcleByTemplate(params, pojoClass, dataSet, diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/params/ExcelBaseEntity.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/params/ExcelBaseEntity.java index b6516a2..4eda6fd 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/params/ExcelBaseEntity.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/params/ExcelBaseEntity.java @@ -52,7 +52,6 @@ public class ExcelBaseEntity { private Method method; /** * 这个是不是超链接,如果是需要实现接口返回对象 - * @return */ private boolean hyperlink; 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 13414f4..8a26948 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 @@ -152,7 +152,7 @@ public class ExcelExportServer extends ExcelExportBase { } try { dataHanlder = entity.getDataHanlder(); - if (dataHanlder != null) { + if (dataHanlder != null && dataHanlder.getNeedHandlerFields() != null) { needHanlderList = Arrays.asList(dataHanlder.getNeedHandlerFields()); } // 创建表格样式 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 1bd743c..603e278 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 @@ -78,7 +78,7 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase { /** * 往Sheet 填充正常数据,根据表头信息 使用导入的部分逻辑,坐对象映射 * - * @param teplateParams + * @param sheet * @param pojoClass * @param dataSet * @param workbook @@ -124,7 +124,7 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase { /** * 下移数据 - * @param its + * @param dataSet * @param excelParams * @return */ @@ -204,10 +204,7 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase { /** * 克隆excel防止操作原对象,workbook无法克隆,只能对excel进行克隆 * - * @param teplateParams * @throws Exception - * @author JueYue - * 2013-11-11 */ private Workbook getCloneWorkBook() throws Exception { return ExcelCache.getWorkbook(teplateParams.getTemplateUrl(), teplateParams.getSheetNum(), @@ -218,7 +215,6 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase { /** * 获取表头数据,设置表头的序号 * - * @param teplateParams * @param sheet * @return */ @@ -349,7 +345,7 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase { * 利用foreach循环输出数据 * @param cell * @param map - * @param oldString + * @param name * @throws Exception */ private void addListDataToExcel(Cell cell, Map map, @@ -417,12 +413,15 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase { MergedRegionHelper mergedRegionHelper) throws Exception { //所有的cell创建一遍 for (int i = 0; i < rowspan; i++) { + int size = columns.size();//判断是不是超出设置了 for (int j = columnIndex, max = columnIndex + colspan; j < max; j++) { if (row.getCell(j) == null) { row.createCell(j); CellStyle style = row.getRowNum() % 2 == 0 - ? getStyles(false, columns.get(columnIndex - j)) - : getStyles(true, columns.get(columnIndex - j)); + ? getStyles(false, + size >= j - columnIndex ? null : columns.get(j - columnIndex)) + : getStyles(true, + size >= j - columnIndex ? null : columns.get(j - columnIndex)); //返回的styler不为空时才使用,否则使用Excel设置的,更加推荐Excel设置的样式 if (style != null) row.getCell(j).setCellStyle(style); @@ -501,7 +500,7 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase { * 设置合并单元格的样式 * @param row * @param ci - * @param excelForEachParams + * @param params */ private void setMergedRegionStyle(Row row, int ci, ExcelForEachParams params) { //第一行数据 @@ -593,7 +592,7 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase { /** * 获取模板参数 - * @param string + * @param name * @param cell * @param mergedRegionHelper * @return @@ -628,7 +627,6 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase { * * @param excelParams * @param titlemap - * @return */ private void sortAndFilterExportField(List excelParams, Map titlemap) { diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/builder/ExcelChartBuildService.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/builder/ExcelChartBuildService.java index 836cd50..d10ea67 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/builder/ExcelChartBuildService.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/builder/ExcelChartBuildService.java @@ -149,7 +149,6 @@ public class ExcelChartBuildService { /** * 构建图形对象 - * @param workbook * @param dataSourceSheet * @param tragetSheet * @param graph 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 5a8939a..0500f96 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 @@ -242,7 +242,7 @@ public class ExcelToHtmlServer { * 获取图片最大宽度 * @param colIndex * @param sheet - * @param span + * @param rowAndColSpan * @return */ private int getImageMaxWidth(Integer[] rowAndColSpan, int colIndex, Sheet sheet) { diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/CellValueServer.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/CellValueServer.java index 36ab3a3..b666580 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/CellValueServer.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/CellValueServer.java @@ -56,7 +56,7 @@ public class CellValueServer { * 获取单元格内的值 * * @param cell - * @param colInfo + * @param entity * @return */ private Object getCellValue(String xclass, Cell cell, ExcelImportEntity entity) { diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/ExcelImportServer.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/ExcelImportServer.java index ec89095..39f3109 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/ExcelImportServer.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/ExcelImportServer.java @@ -86,7 +86,6 @@ public class ExcelImportServer extends ImportBaseService { /*** * 向List里面继续添加元素 * - * @param exclusions * @param object * @param param * @param row diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/sax/parse/SaxRowRead.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/sax/parse/SaxRowRead.java index ee34fc4..b30b8f1 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/sax/parse/SaxRowRead.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/sax/parse/SaxRowRead.java @@ -157,16 +157,15 @@ public class SaxRowRead extends ImportBaseService implements ISaxRowRead { } - /*** + /** * 向List里面继续添加元素 - * - * @param exclusions * @param object * @param param * @param datas * @param titlemap * @param targetId * @param params + * @throws Exception */ private void addListContinue(Object object, ExcelCollectionParams param, List datas, Map titlemap, diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/pdf/export/PdfExportServer.java b/easypoi-base/src/main/java/org/jeecgframework/poi/pdf/export/PdfExportServer.java index d8750ea..eb6216c 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/pdf/export/PdfExportServer.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/pdf/export/PdfExportServer.java @@ -169,7 +169,7 @@ public class PdfExportServer extends ExportBase { * @param table * @param obj * @param rowHeight - * @param list + * @param excelParams * @throws Exception */ private void createListCells(PdfPTable table, Object obj, List excelParams, @@ -247,7 +247,7 @@ public class PdfExportServer extends ExportBase { * 创建表头 * * @param title - * @param index + * @param table */ private int createTitleRow(PdfExportParams title, PdfPTable table, List excelParams) { diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiElUtil.java b/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiElUtil.java index 1101a8e..9b9d0c4 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiElUtil.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiElUtil.java @@ -132,7 +132,7 @@ public final class PoiElUtil { /** * 判断是不是常量 - * @param string + * @param param * @return */ private static String isConstant(String param) { 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 b1e92f3..a6299e1 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 @@ -66,10 +66,10 @@ public class ParseWord07 { Object[] isAndType = PoiPublicUtil.getIsAndType(obj); String picId; try { - picId = currentRun.getParagraph().getDocument().addPictureData((byte[]) isAndType[0], + picId = currentRun.getDocument().addPictureData((byte[]) isAndType[0], (Integer) isAndType[1]); - ((MyXWPFDocument) currentRun.getParagraph().getDocument()).createPicture(currentRun, - picId, currentRun.getParagraph().getDocument() + ((MyXWPFDocument) currentRun.getDocument()).createPicture(currentRun, + picId, currentRun.getDocument() .getNextPicNameNumber((Integer) isAndType[1]), obj.getWidth(), obj.getHeight()); diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/word/parse/excel/ExcelEntityParse.java b/easypoi-base/src/main/java/org/jeecgframework/poi/word/parse/excel/ExcelEntityParse.java index 68d0c1b..a0744d0 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/word/parse/excel/ExcelEntityParse.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/word/parse/excel/ExcelEntityParse.java @@ -200,7 +200,6 @@ public class ExcelEntityParse extends ExportBase { * * @param excelParams * @param titlemap - * @return */ private void sortAndFilterExportField(List excelParams, Map titlemap) {