Browse Source

修复了Index ADD的bug,但是对于Merge的特性支持还存在问题,需要进一步跟踪

4.1.3.A
xfworld 9 years ago
parent
commit
3b54157f5b
2 changed files with 9 additions and 4 deletions
  1. +7
    -3
      easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java
  2. +2
    -1
      easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExcelExportBase.java

+ 7
- 3
easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java View File

@@ -112,9 +112,13 @@ public class ExcelExportServer extends ExcelExportBase {
}
try {
List<ExcelExportEntity> excelParams = new ArrayList<ExcelExportEntity>();
if (entity.isAddIndex()) {
excelParams.add(indexExcelEntity(entity));
}
/**
* createSheetMap 中也会判断index字段,会导致重复添加,出现null 情况
* 这里的代码注释掉 @date 2016-05-27 by xfworld
*/
// if (entity.isAddIndex()) {
// excelParams.add(indexExcelEntity(entity));
// }
// 得到所有字段
Field fileds[] = PoiPublicUtil.getClassFields(pojoClass);
ExcelTarget etarget = pojoClass.getAnnotation(ExcelTarget.class);


+ 2
- 1
easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExcelExportBase.java View File

@@ -107,7 +107,8 @@ public abstract class ExcelExportBase extends ExportBase {
maxHeight = list.size();
}
} else {
Object value = getCellValue(entity, t);
Object value = getCellValue(entity, t);
if (entity.getType() == BaseEntityTypeConstants.StringType) {
createStringCell(row, cellNum++, value == null ? "" : value.toString(),
index % 2 == 0 ? getStyles(false, entity) : getStyles(true, entity),


Loading…
Cancel
Save