Browse Source

!39 Fix Issues: [#ITJKS] [#ITEX8];exportBigExcel导出无法使用DictHandler、导入时Dict无法转换的两个问题。

Merge pull request !39 from liuyaoduan/master
4.1.3.A
jueyue 6 years ago
committed by Gitee
parent
commit
7510f29149
2 changed files with 3 additions and 2 deletions
  1. +2
    -0
      easypoi-base/src/main/java/cn/afterturn/easypoi/excel/export/ExcelBatchExportService.java
  2. +1
    -2
      easypoi-base/src/main/java/cn/afterturn/easypoi/excel/imports/CellValueService.java

+ 2
- 0
easypoi-base/src/main/java/cn/afterturn/easypoi/excel/export/ExcelBatchExportService.java View File

@@ -123,6 +123,8 @@ public class ExcelBatchExportService extends ExcelExportService {
if (dataHandler != null && dataHandler.getNeedHandlerFields() != null) {
needHandlerList = Arrays.asList(dataHandler.getNeedHandlerFields());
}
dictHandler = entity.getDictHandler();
i18nHandler = entity.getI18nHandler();
// 创建表格样式
setExcelExportStyler((IExcelExportStyler) entity.getStyle()
.getConstructor(Workbook.class).newInstance(workbook));


+ 1
- 2
easypoi-base/src/main/java/cn/afterturn/easypoi/excel/imports/CellValueService.java View File

@@ -214,9 +214,8 @@ public class CellValueService {
if (entity != null) {
result = handlerSuffix(entity.getSuffix(), result);
result = replaceValue(entity.getReplace(), result);
result = replaceValue(entity.getReplace(), result);
if (dictHandler != null && StringUtils.isNoneBlank(entity.getDict())) {
dictHandler.toValue(entity.getDict(), object, entity.getName(), result);
result = dictHandler.toValue(entity.getDict(), object, entity.getName(), result);
}
}
result = handlerValue(dataHandler, object, result, titleString);


Loading…
Cancel
Save