|
|
|
@ -284,7 +284,7 @@ public class ExcelUtil<T>
|
|
|
|
|
String dateFormat = field.getAnnotation(Excel.class).dateFormat();
|
|
|
|
|
if (StringUtils.isNotEmpty(dateFormat))
|
|
|
|
|
{
|
|
|
|
|
val = parseDateToStr(dateFormat, (Date) val);
|
|
|
|
|
val = parseDateToStr(dateFormat, val);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
@ -703,7 +703,7 @@ public class ExcelUtil<T>
|
|
|
|
|
String separator = attr.separator();
|
|
|
|
|
if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value))
|
|
|
|
|
{
|
|
|
|
|
cell.setCellValue(parseDateToStr(dateFormat, (Date) value));
|
|
|
|
|
cell.setCellValue(parseDateToStr(dateFormat, value));
|
|
|
|
|
}
|
|
|
|
|
else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value))
|
|
|
|
|
{
|
|
|
|
|