Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
finance-manage
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
finance-oa
finance-manage
Commits
5e8ccda5
Commit
5e8ccda5
authored
Mar 09, 2022
by
coolkidhay
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
日期转换错误,issue地址:
https://gitee.com/y_project/RuoYi-Vue/issues/I4X0U7
parent
62fc3807
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
...n/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+2
-2
No files found.
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
View file @
5e8ccda5
...
@@ -316,7 +316,7 @@ public class ExcelUtil<T>
...
@@ -316,7 +316,7 @@ public class ExcelUtil<T>
String
dateFormat
=
field
.
getAnnotation
(
Excel
.
class
).
dateFormat
();
String
dateFormat
=
field
.
getAnnotation
(
Excel
.
class
).
dateFormat
();
if
(
StringUtils
.
isNotEmpty
(
dateFormat
))
if
(
StringUtils
.
isNotEmpty
(
dateFormat
))
{
{
val
=
parseDateToStr
(
dateFormat
,
(
Date
)
val
);
val
=
parseDateToStr
(
dateFormat
,
val
);
}
}
else
else
{
{
...
@@ -823,7 +823,7 @@ public class ExcelUtil<T>
...
@@ -823,7 +823,7 @@ public class ExcelUtil<T>
String
dictType
=
attr
.
dictType
();
String
dictType
=
attr
.
dictType
();
if
(
StringUtils
.
isNotEmpty
(
dateFormat
)
&&
StringUtils
.
isNotNull
(
value
))
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
))
else
if
(
StringUtils
.
isNotEmpty
(
readConverterExp
)
&&
StringUtils
.
isNotNull
(
value
))
{
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment