diff --git a/storage/src/main/java/com/zfoo/storage/util/CellUtils.java b/storage/src/main/java/com/zfoo/storage/util/CellUtils.java index 566c68f6..d2f942d3 100644 --- a/storage/src/main/java/com/zfoo/storage/util/CellUtils.java +++ b/storage/src/main/java/com/zfoo/storage/util/CellUtils.java @@ -100,7 +100,9 @@ public abstract class CellUtils { // 普通数字 if (null != format && !format.contains(StringUtils.PERIOD)) { var longValue = (long) value; - // 对于无小数部分的数字类型,转为Long + if (longValue == value) { + return Long.valueOf(longValue); + } } return value; } diff --git a/storage/src/test/java/com/zfoo/storage/resource/StudentResource.java b/storage/src/test/java/com/zfoo/storage/resource/StudentResource.java index 3a90c377..172c26e3 100644 --- a/storage/src/test/java/com/zfoo/storage/resource/StudentResource.java +++ b/storage/src/test/java/com/zfoo/storage/resource/StudentResource.java @@ -34,6 +34,7 @@ public class StudentResource { private String name; private int age; + private float score; private String[] courses; private User[] users; private User user; @@ -55,6 +56,10 @@ public class StudentResource { return age; } + public float getScore() { + return score; + } + public String[] getCourses() { return courses; } diff --git a/storage/src/test/resources/excel/StudentResource.xlsx b/storage/src/test/resources/excel/StudentResource.xlsx index bc8190ef..d7378b7a 100644 Binary files a/storage/src/test/resources/excel/StudentResource.xlsx and b/storage/src/test/resources/excel/StudentResource.xlsx differ