From 02c50f9c5d4d72e2be847a83ad106afe0fa44eda Mon Sep 17 00:00:00 2001 From: Hugh Gao Date: Sat, 22 Jun 2019 21:22:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5null?= =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../afterturn/easypoi/excel/imports/base/ImportBaseService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/imports/base/ImportBaseService.java b/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/imports/base/ImportBaseService.java index fe52d46..62baec6 100644 --- a/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/imports/base/ImportBaseService.java +++ b/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/imports/base/ImportBaseService.java @@ -186,7 +186,7 @@ public class ImportBaseService { if (PoiPublicUtil.isNotUserExcelUserThis(null, field, targetId)) { continue; } - if (PoiPublicUtil.isJavaClass(field)) { + if (PoiPublicUtil.isJavaClass(field) || field.getType().isEnum()) { addEntityToMap(targetId, field, excelEntity, pojoClass, getMethods, temp, null); } else { List newMethods = new ArrayList(); From 03acac42f508e7f7a6f2883fac3c4b5d2680fe08 Mon Sep 17 00:00:00 2001 From: Hugh Gao Date: Sun, 23 Jun 2019 11:19:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A9=E7=94=A8@Excel=E4=B8=AD=E7=9A=84n?= =?UTF-8?q?ame=E5=B1=9E=E6=80=A7=E6=9D=A5=E6=A0=87=E6=B3=A8=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E4=BF=A1=E6=81=AF=E4=B8=AD=E7=9A=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../easypoi/util/PoiValidationUtil.java | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) 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 d48a763..7ac1ecf 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 @@ -15,6 +15,12 @@ */ package cn.afterturn.easypoi.util; +import cn.afterturn.easypoi.excel.annotation.Excel; + +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import java.util.Set; import javax.validation.ConstraintViolation; @@ -52,9 +58,22 @@ public class PoiValidationUtil { private static String getValidateErrMsg(Set> set) { StringBuilder builder = new StringBuilder(); for (ConstraintViolation constraintViolation : set) { + Class cls = constraintViolation.getRootBean().getClass(); + String fieldName = constraintViolation.getPropertyPath().toString(); + List fields = new ArrayList<>(Arrays.asList(cls.getDeclaredFields())); + Class superClass = cls.getSuperclass(); + if (superClass != null) { + fields.addAll(Arrays.asList(superClass.getDeclaredFields())); + } + for (Field field: fields) { + if (field.getName().equals(fieldName) && field.isAnnotationPresent(Excel.class)) { + builder.append(field.getAnnotation(Excel.class).name()); + break; + } + } builder.append(constraintViolation.getMessage()).append(","); } - return builder.substring(0, builder.length() - 1).toString(); + return builder.substring(0, builder.length() - 1); } }