|
|
@ -33,9 +33,6 @@ public abstract class AbstractExcelWriteExecutor implements ExcelWriteExecutor { |
|
|
|
protected CellData<?> converterAndSet(WriteHolder currentWriteHolder, Class<?> clazz, CellDataTypeEnum targetType, |
|
|
|
protected CellData<?> converterAndSet(WriteHolder currentWriteHolder, Class<?> clazz, CellDataTypeEnum targetType, |
|
|
|
Cell cell, Object value, |
|
|
|
Cell cell, Object value, |
|
|
|
ExcelContentProperty excelContentProperty, Head head, Integer relativeRowIndex) { |
|
|
|
ExcelContentProperty excelContentProperty, Head head, Integer relativeRowIndex) { |
|
|
|
if (value == null) { |
|
|
|
|
|
|
|
return new CellData<>(CellDataTypeEnum.EMPTY); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if (value instanceof String && currentWriteHolder.globalConfiguration().getAutoTrim()) { |
|
|
|
if (value instanceof String && currentWriteHolder.globalConfiguration().getAutoTrim()) { |
|
|
|
value = ((String)value).trim(); |
|
|
|
value = ((String)value).trim(); |
|
|
|
} |
|
|
|
} |
|
|
@ -75,9 +72,6 @@ public abstract class AbstractExcelWriteExecutor implements ExcelWriteExecutor { |
|
|
|
protected CellData<?> convert(WriteHolder currentWriteHolder, Class<?> clazz, CellDataTypeEnum targetType, |
|
|
|
protected CellData<?> convert(WriteHolder currentWriteHolder, Class<?> clazz, CellDataTypeEnum targetType, |
|
|
|
Cell cell, |
|
|
|
Cell cell, |
|
|
|
Object value, ExcelContentProperty excelContentProperty) { |
|
|
|
Object value, ExcelContentProperty excelContentProperty) { |
|
|
|
if (value == null) { |
|
|
|
|
|
|
|
return new CellData<>(CellDataTypeEnum.EMPTY); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
// This means that the user has defined the data.
|
|
|
|
// This means that the user has defined the data.
|
|
|
|
if (value instanceof CellData) { |
|
|
|
if (value instanceof CellData) { |
|
|
|
CellData<?> cellDataValue = (CellData<?>)value; |
|
|
|
CellData<?> cellDataValue = (CellData<?>)value; |
|
|
|