!146 浏览代码时间字符串处理

Merge pull request !146 from 厚积薄发/master
6 years ago · 56a6e940c2
parent b05a539970 868edbc88c
commit 56a6e940c2
1 changed files with 9 additions and 1 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,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))