From a353e568f759d7a8e7ea9e98a9e07f0cb2599609 Mon Sep 17 00:00:00 2001 From: Hugh Gao Date: Fri, 28 Jun 2019 12:27:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AF=B9=E4=BA=8E=E6=B2=A1=E6=9C=89@Excel?= =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5=E6=A0=A1=E9=AA=8C=EF=BC=8C=E5=85=B6?= =?UTF-8?q?=E5=90=8D=E5=AD=97=E7=9B=B4=E6=8E=A5=E4=BD=BF=E7=94=A8=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/afterturn/easypoi/util/PoiValidationUtil.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/easypoi-base/src/main/java/cn/afterturn/easypoi/util/PoiValidationUtil.java b/easypoi-base/src/main/java/cn/afterturn/easypoi/util/PoiValidationUtil.java index 7ac1ecf..47a529e 100644 --- a/easypoi-base/src/main/java/cn/afterturn/easypoi/util/PoiValidationUtil.java +++ b/easypoi-base/src/main/java/cn/afterturn/easypoi/util/PoiValidationUtil.java @@ -65,13 +65,17 @@ public class PoiValidationUtil { if (superClass != null) { fields.addAll(Arrays.asList(superClass.getDeclaredFields())); } + String name = null; for (Field field: fields) { if (field.getName().equals(fieldName) && field.isAnnotationPresent(Excel.class)) { - builder.append(field.getAnnotation(Excel.class).name()); + name = field.getAnnotation(Excel.class).name(); break; } } - builder.append(constraintViolation.getMessage()).append(","); + if (name == null) { + name = fieldName; + } + builder.append(name).append(constraintViolation.getMessage()).append(","); } return builder.substring(0, builder.length() - 1); } From afe6b5e3ecc48913c073dfbf123df0c1eaf55fe6 Mon Sep 17 00:00:00 2001 From: Hugh Gao Date: Sun, 30 Jun 2019 20:45:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?IExcelDataModel=20=E4=BD=BF=E7=94=A8Integer?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=EF=BC=8C=E4=BB=A5=E9=98=B2=E6=AD=A2inbox,=20?= =?UTF-8?q?unbox=E7=9A=84null=E9=94=99=E8=AF=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/afterturn/easypoi/handler/inter/IExcelDataModel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/easypoi-base/src/main/java/cn/afterturn/easypoi/handler/inter/IExcelDataModel.java b/easypoi-base/src/main/java/cn/afterturn/easypoi/handler/inter/IExcelDataModel.java index 2731ad5..7c53675 100644 --- a/easypoi-base/src/main/java/cn/afterturn/easypoi/handler/inter/IExcelDataModel.java +++ b/easypoi-base/src/main/java/cn/afterturn/easypoi/handler/inter/IExcelDataModel.java @@ -10,12 +10,12 @@ public interface IExcelDataModel { * 获取行号 * @return */ - public int getRowNum(); + public Integer getRowNum(); /** * 设置行号 * @param rowNum */ - public void setRowNum(int rowNum); + public void setRowNum(Integer rowNum); }