Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
S
sts网站
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liyang
sts网站
Commits
0e2b97a8
Commit
0e2b97a8
authored
Dec 03, 2020
by
RuoYi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
升级poi到最新版本4.1.2
parent
1c7a5faa
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
9 deletions
+6
-9
pom.xml
pom.xml
+1
-1
ExcelUtil.java
...n/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+5
-8
No files found.
pom.xml
View file @
0e2b97a8
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
<jna.version>
5.6.0
</jna.version>
<jna.version>
5.6.0
</jna.version>
<commons.io.version>
2.5
</commons.io.version>
<commons.io.version>
2.5
</commons.io.version>
<commons.fileupload.version>
1.3.3
</commons.fileupload.version>
<commons.fileupload.version>
1.3.3
</commons.fileupload.version>
<poi.version>
3.17
</poi.version>
<poi.version>
4.1.2
</poi.version>
<velocity.version>
1.7
</velocity.version>
<velocity.version>
1.7
</velocity.version>
<jwt.version>
0.9.1
</jwt.version>
<jwt.version>
0.9.1
</jwt.version>
</properties>
</properties>
...
...
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
View file @
0e2b97a8
...
@@ -18,7 +18,6 @@ import java.util.Map;
...
@@ -18,7 +18,6 @@ import java.util.Map;
import
java.util.Set
;
import
java.util.Set
;
import
java.util.UUID
;
import
java.util.UUID
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
import
org.apache.poi.hssf.usermodel.HSSFDateUtil
;
import
org.apache.poi.ss.usermodel.BorderStyle
;
import
org.apache.poi.ss.usermodel.BorderStyle
;
import
org.apache.poi.ss.usermodel.Cell
;
import
org.apache.poi.ss.usermodel.Cell
;
import
org.apache.poi.ss.usermodel.CellStyle
;
import
org.apache.poi.ss.usermodel.CellStyle
;
...
@@ -516,12 +515,10 @@ public class ExcelUtil<T>
...
@@ -516,12 +515,10 @@ public class ExcelUtil<T>
{
{
if
(
ColumnType
.
STRING
==
attr
.
cellType
())
if
(
ColumnType
.
STRING
==
attr
.
cellType
())
{
{
cell
.
setCellType
(
CellType
.
STRING
);
cell
.
setCellValue
(
StringUtils
.
isNull
(
value
)
?
attr
.
defaultValue
()
:
value
+
attr
.
suffix
());
cell
.
setCellValue
(
StringUtils
.
isNull
(
value
)
?
attr
.
defaultValue
()
:
value
+
attr
.
suffix
());
}
}
else
if
(
ColumnType
.
NUMERIC
==
attr
.
cellType
())
else
if
(
ColumnType
.
NUMERIC
==
attr
.
cellType
())
{
{
cell
.
setCellType
(
CellType
.
NUMERIC
);
cell
.
setCellValue
(
StringUtils
.
contains
(
Convert
.
toStr
(
value
),
"."
)
?
Convert
.
toDouble
(
value
)
:
Convert
.
toInt
(
value
));
cell
.
setCellValue
(
StringUtils
.
contains
(
Convert
.
toStr
(
value
),
"."
)
?
Convert
.
toDouble
(
value
)
:
Convert
.
toInt
(
value
));
}
}
}
}
...
@@ -980,10 +977,10 @@ public class ExcelUtil<T>
...
@@ -980,10 +977,10 @@ public class ExcelUtil<T>
Cell
cell
=
row
.
getCell
(
column
);
Cell
cell
=
row
.
getCell
(
column
);
if
(
StringUtils
.
isNotNull
(
cell
))
if
(
StringUtils
.
isNotNull
(
cell
))
{
{
if
(
cell
.
getCellType
Enum
()
==
CellType
.
NUMERIC
||
cell
.
getCellTypeEnum
()
==
CellType
.
FORMULA
)
if
(
cell
.
getCellType
()
==
CellType
.
NUMERIC
||
cell
.
getCellType
()
==
CellType
.
FORMULA
)
{
{
val
=
cell
.
getNumericCellValue
();
val
=
cell
.
getNumericCellValue
();
if
(
HSSF
DateUtil
.
isCellDateFormatted
(
cell
))
if
(
DateUtil
.
isCellDateFormatted
(
cell
))
{
{
val
=
DateUtil
.
getJavaDate
((
Double
)
val
);
// POI Excel 日期格式转换
val
=
DateUtil
.
getJavaDate
((
Double
)
val
);
// POI Excel 日期格式转换
}
}
...
@@ -999,15 +996,15 @@ public class ExcelUtil<T>
...
@@ -999,15 +996,15 @@ public class ExcelUtil<T>
}
}
}
}
}
}
else
if
(
cell
.
getCellType
Enum
()
==
CellType
.
STRING
)
else
if
(
cell
.
getCellType
()
==
CellType
.
STRING
)
{
{
val
=
cell
.
getStringCellValue
();
val
=
cell
.
getStringCellValue
();
}
}
else
if
(
cell
.
getCellType
Enum
()
==
CellType
.
BOOLEAN
)
else
if
(
cell
.
getCellType
()
==
CellType
.
BOOLEAN
)
{
{
val
=
cell
.
getBooleanCellValue
();
val
=
cell
.
getBooleanCellValue
();
}
}
else
if
(
cell
.
getCellType
Enum
()
==
CellType
.
ERROR
)
else
if
(
cell
.
getCellType
()
==
CellType
.
ERROR
)
{
{
val
=
cell
.
getErrorCellValue
();
val
=
cell
.
getErrorCellValue
();
}
}
...
...
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