时间字符串处理

6 years ago · 69c6aad0e4
parent 408475e3f5
commit 69c6aad0e4
1 changed files with 9 additions and 2 deletions
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@ -224,8 +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))
                    {