Browse Source

!47 对于没有@Excel的字段校验,其名字直接使用字段名

Merge pull request !47 from klniu/master
4.1.3.A
jueyue 5 years ago
committed by Gitee
parent
commit
93e21fffbb
2 changed files with 8 additions and 4 deletions
  1. +2
    -2
      easypoi-base/src/main/java/cn/afterturn/easypoi/handler/inter/IExcelDataModel.java
  2. +6
    -2
      easypoi-base/src/main/java/cn/afterturn/easypoi/util/PoiValidationUtil.java

+ 2
- 2
easypoi-base/src/main/java/cn/afterturn/easypoi/handler/inter/IExcelDataModel.java View File

@@ -10,12 +10,12 @@ public interface IExcelDataModel {
* 获取行号 * 获取行号
* @return * @return
*/ */
public int getRowNum();
public Integer getRowNum();


/** /**
* 设置行号 * 设置行号
* @param rowNum * @param rowNum
*/ */
public void setRowNum(int rowNum);
public void setRowNum(Integer rowNum);


} }

+ 6
- 2
easypoi-base/src/main/java/cn/afterturn/easypoi/util/PoiValidationUtil.java View File

@@ -65,13 +65,17 @@ public class PoiValidationUtil {
if (superClass != null) { if (superClass != null) {
fields.addAll(Arrays.asList(superClass.getDeclaredFields())); fields.addAll(Arrays.asList(superClass.getDeclaredFields()));
} }
String name = null;
for (Field field: fields) { for (Field field: fields) {
if (field.getName().equals(fieldName) && field.isAnnotationPresent(Excel.class)) { if (field.getName().equals(fieldName) && field.isAnnotationPresent(Excel.class)) {
builder.append(field.getAnnotation(Excel.class).name());
name = field.getAnnotation(Excel.class).name();
break; 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); return builder.substring(0, builder.length() - 1);
} }


Loading…
Cancel
Save