时间字符串处理

5 years ago · c928e55b2c
parent 6d4e5e8c3a
commit c928e55b2c
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
@ -223,10 +223,18 @@ public class ExcelUtil<T>
                            val = StringUtils.substringBefore(s, ".0");
                        }
                        else
+                        {
+                            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))
                    {
                        val = Convert.toInt(val);