From b8a3bb8257cd2a5de0dc23994580892506a1b7fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E4=BB=AA?= Date: Thu, 13 May 2021 16:17:28 +0800 Subject: [PATCH] =?UTF-8?q?*=20=E4=BF=AE=E5=A4=8D=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E7=94=A8string=E6=8E=A5=E6=94=B6?= =?UTF-8?q?=E6=95=B0=E5=AD=97=20=E5=8F=AF=E8=83=BD=E5=9B=9B=E8=88=8D?= =?UTF-8?q?=E4=BA=94=E5=85=A5=E4=B8=8D=E4=B8=80=E8=87=B4=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../handlers/AbstractCellValueTagHandler.java | 2 +- .../easyexcel/test/temp/Lock2Test.java | 2 +- src/test/resources/dataformat/dataformat.xls | Bin 28672 -> 28672 bytes src/test/resources/dataformat/dataformat.xlsx | Bin 12192 -> 12460 bytes update.md | 3 +++ 6 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index d411ade..9f1a4c7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.alibaba easyexcel - 2.2.9 + 2.2.10 jar easyexcel diff --git a/src/main/java/com/alibaba/excel/analysis/v07/handlers/AbstractCellValueTagHandler.java b/src/main/java/com/alibaba/excel/analysis/v07/handlers/AbstractCellValueTagHandler.java index f10fa5a..580e670 100644 --- a/src/main/java/com/alibaba/excel/analysis/v07/handlers/AbstractCellValueTagHandler.java +++ b/src/main/java/com/alibaba/excel/analysis/v07/handlers/AbstractCellValueTagHandler.java @@ -43,7 +43,7 @@ public abstract class AbstractCellValueTagHandler extends AbstractXlsxTagHandler break; } tempCellData.setType(CellDataTypeEnum.NUMBER); - tempCellData.setNumberValue(new BigDecimal(tempData.toString())); + tempCellData.setNumberValue(BigDecimal.valueOf(Double.parseDouble(tempDataString))); break; default: throw new IllegalStateException("Cannot set values now"); diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java b/src/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java index c3f7ea1..9220264 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java @@ -34,7 +34,7 @@ public class Lock2Test { @Test public void test() throws Exception { // File file = TestFileUtil.readUserHomeFile("test/test6.xls"); - File file = new File("/Users/zhuangjiaju/Downloads/签到金模板-0507-v3.xlsx"); + File file = new File("/Users/zhuangjiaju/test/签到金模板-0507-v5.xlsx"); List list = EasyExcel.read(file).sheet(0).headRowNumber(0).doReadSync(); LOGGER.info("数据:{}", list.size()); diff --git a/src/test/resources/dataformat/dataformat.xls b/src/test/resources/dataformat/dataformat.xls index 5d0d7ff767dc57baa5fc429aed16570fc5751aa2..c8afd6461f3398c3405321a0358d024cf55f2719 100644 GIT binary patch delta 458 zcmZp8z}WDBaYGIZ8-oeFaMJ#Ph%CVb&u{>jED)Ha^h^LK7#*jgR;SK`>0|&zd zMj*w|#=ye3Ew5*in9jubWwLRK;^d$dnaKqy`h0>whcN)P2?8N2>*Td5!HmZ@Go~JAWa^LEd@n+p kak6Y$`{bOAyOXk9I2kIZJDzjD&d5BuFvECrLskPT075or9{>OV delta 304 zcmZp8z}WDBaYGIZ+lEgM-+p(VT*T7GloPZ07t1qtrWbyjAMvy?ZEoR@-75Mij{ zU_b&H3?ck05p} z<}jd)(dHmeRp!YPeAtX0+AuKi0EN7485l}|^lBh|4M_9bF)&y$GBCsd>2@G}3rMpv zF)*CA-+aPnE)UxqUj_!fh|P`Z(u|wiqIww_B{qx1xU+3;O-f;6JT>`MisEF!RI$nO zsce(gQ}y|T7=U^i7#W0skcnxsPI@qtKon5-BF4$l=_*V&qJivsrpX4G+b3nYa5nhn T0K?=uBlBd%OykWBSq-cJmMc{- diff --git a/src/test/resources/dataformat/dataformat.xlsx b/src/test/resources/dataformat/dataformat.xlsx index c207011836ae3b20c30ea1fc5912c0eaec0c564a..f77dd9fd35d736e487afb71af78b23c6877a9320 100644 GIT binary patch delta 5013 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 D)8cl- delta 4721 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 diff --git a/update.md b/update.md index ef085da..f2d889a 100644 --- a/update.md +++ b/update.md @@ -1,3 +1,6 @@ +# 2.2.10 +* 修复读取的时候用string接收数字 可能四舍五入不一致的bug + # 2.2.9 * 修复读取的时候用string接收数字 可能四舍五入不一致的bug -- GitLab