Skip to content

解决含有合并单元格配置导出时,大量的ERROR日志"合并单元格错误日志"提示问题 #185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yanggjjie998 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

解决含有合并单元格配置导出时,大量的ERROR日志"合并单元格错误日志"提示问题 #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions autopoi/src/main/java/org/jeecgframework/poi/excel/export/base/ExcelExportBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,16 +168,19 @@ public int createCells(Drawing patriarch, int index, Object t, List<ExcelExportE
sheet.getRow(i).createCell(cellNum);
sheet.getRow(i).getCell(cellNum).setCellStyle(getStyles(false, entity));
}
//update-begin-author:wangshuai date:20201116 for:一对多导出needMerge 子表数据对应数量小于2时报错 github#1840、gitee I1YH6B
try {
if (maxHeight > 1) {
sheet.addMergedRegion(new CellRangeAddress(index, index + maxHeight - 1, cellNum, cellNum));
int lastRow = index + maxHeight - 1;
if(index < lastRow){
//update-begin-author:wangshuai date:20201116 for:一对多导出needMerge 子表数据对应数量小于2时报错 github#1840、gitee I1YH6B
try {
if (maxHeight > 1) {
sheet.addMergedRegion(new CellRangeAddress(index, lastRow, cellNum, cellNum));
}
}catch (IllegalArgumentException e){
LOGGER.error("合并单元格错误日志："+e.getMessage());
e.fillInStackTrace();
}
}catch (IllegalArgumentException e){
LOGGER.error("合并单元格错误日志："+e.getMessage());
e.fillInStackTrace();
//update-end-author:wangshuai date:20201116 for:一对多导出needMerge 子表数据对应数量小于2时报错 github#1840、gitee I1YH6B
}
//update-end-author:wangshuai date:20201116 for:一对多导出needMerge 子表数据对应数量小于2时报错 github#1840、gitee I1YH6B
cellNum++;
}
}
Expand Down
36 changes: 22 additions & 14 deletions autopoi/src/main/java/org/jeecgframework/poi/util/PoiMergeCellUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,18 @@ public static void mergeCells(Sheet sheet, Map<Integer, int[]> mergeMap, int sta
}
if (mergeDataMap.size() > 0) {
for (Integer index : mergeDataMap.keySet()) {
//update-begin-author:wangshuai date:20201118 for:一对多导出needMerge 子表数据对应数量小于2时报错 github#1840、gitee I1YH6B
try{
sheet.addMergedRegion(new CellRangeAddress(mergeDataMap.get(index).getStartRow(), mergeDataMap.get(index).getEndRow(), index, index));
}catch (IllegalArgumentException e){
LOGGER.error("合并单元格错误日志："+e.getMessage());
e.fillInStackTrace();
final int mergeStartRow = mergeDataMap.get(index).getStartRow();
final int mergeEndRow = mergeDataMap.get(index).getEndRow();
if(mergeStartRow < mergeEndRow){
//update-begin-author:wangshuai date:20201118 for:一对多导出needMerge 子表数据对应数量小于2时报错 github#1840、gitee I1YH6B
try{
sheet.addMergedRegion(new CellRangeAddress(mergeStartRow, mergeEndRow, index, index));
}catch (IllegalArgumentException e){
LOGGER.error("合并单元格错误日志："+e.getMessage());
e.fillInStackTrace();
}
//update-end-author:wangshuai date:20201118 for:一对多导出needMerge 子表数据对应数量小于2时报错 github#1840、gitee I1YH6B
}
//update-end-author:wangshuai date:20201118 for:一对多导出needMerge 子表数据对应数量小于2时报错 github#1840、gitee I1YH6B
}
}

Expand All @@ -130,14 +134,18 @@ private static void hanlderMergeCells(Integer index, int rowNum, String text, Ma
if (checkIsEqualByCellContents(mergeDataMap.get(index), text, cell, delys, rowNum)) {
mergeDataMap.get(index).setEndRow(rowNum);
} else {
//update-begin-author:wangshuai date:20201118 for:一对多导出needMerge 子表数据对应数量小于2时报错 github#1840、gitee I1YH6B
try{
sheet.addMergedRegion(new CellRangeAddress(mergeDataMap.get(index).getStartRow(), mergeDataMap.get(index).getEndRow(), index, index));
}catch (IllegalArgumentException e){
LOGGER.error("合并单元格错误日志："+e.getMessage());
e.fillInStackTrace();
final int startRow = mergeDataMap.get(index).getStartRow();
final int endRow = mergeDataMap.get(index).getEndRow();
if(startRow < endRow){
//update-begin-author:wangshuai date:20201118 for:一对多导出needMerge 子表数据对应数量小于2时报错 github#1840、gitee I1YH6B
try{
sheet.addMergedRegion(new CellRangeAddress(startRow, endRow, index, index));
}catch (IllegalArgumentException e){
LOGGER.error("合并单元格错误日志："+e.getMessage());
e.fillInStackTrace();
}
//update-end-author:wangshuai date:20201118 for:一对多导出needMerge 子表数据对应数量小于2时报错 github#1840、gitee I1YH6B
}
//update-end-author:wangshuai date:20201118 for:一对多导出needMerge 子表数据对应数量小于2时报错 github#1840、gitee I1YH6B
mergeDataMap.put(index, createMergeEntity(text, rowNum, cell, delys));
}
} else {
Expand Down