|
@@ -224,7 +224,15 @@ public class ExcelUtil<T>
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- val = Convert.toStr(val);
|
|
|
+ String dateFormat = field.getAnnotation(Excel.class).dateFormat();
|
|
|
+ if(StringUtils.isNotEmpty(dateFormat))
|
|
|
+ {
|
|
|
+ val=DateUtils.parseDateToStr(dateFormat,(Date) val);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ val = Convert.toStr(val);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
else if ((Integer.TYPE == fieldType) || (Integer.class == fieldType))
|