diff --git a/web/src/main/java/cn/jlw/util/excel/listener/MyValidateExcelCellDataListener.java b/web/src/main/java/cn/jlw/util/excel/listener/MyValidateExcelCellDataListener.java index 55565d72..77c61381 100644 --- a/web/src/main/java/cn/jlw/util/excel/listener/MyValidateExcelCellDataListener.java +++ b/web/src/main/java/cn/jlw/util/excel/listener/MyValidateExcelCellDataListener.java @@ -89,6 +89,8 @@ public class MyValidateExcelCellDataListener implements ReadListener { // 如果有忽略必传的注解,并且没有查询到值则直接跳过必传验证 if (requireIgnore != null && fieldValue == null) { ReflectUtil.setFieldValue(bean, field, requireIgnore.defaultValue()); + // 如果字段上有忽略的注解,则下面的验证就直接跳过了。 + continue; } // 空值判断 diff --git a/web/src/main/java/com/ibeetl/jlw/entity/dto/StudentBatchImportAdminDTO.java b/web/src/main/java/com/ibeetl/jlw/entity/dto/StudentBatchImportAdminDTO.java index 0ea90435..6b057f4a 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/dto/StudentBatchImportAdminDTO.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/dto/StudentBatchImportAdminDTO.java @@ -65,12 +65,14 @@ public class StudentBatchImportAdminDTO { * 电话 */ @Mobile + @ExcelRequireIgnore private String studentMobile ; /** * 邮箱 */ @Email + @ExcelRequireIgnore private String studentEmail ; /** * 微信 diff --git a/web/src/main/java/com/ibeetl/jlw/entity/dto/StudentBatchImportUniAdminDTO.java b/web/src/main/java/com/ibeetl/jlw/entity/dto/StudentBatchImportUniAdminDTO.java index 6bb8ac32..087aff9f 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/dto/StudentBatchImportUniAdminDTO.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/dto/StudentBatchImportUniAdminDTO.java @@ -59,12 +59,14 @@ public class StudentBatchImportUniAdminDTO { * 电话 */ @Mobile + @ExcelRequireIgnore private String studentMobile ; /** * 邮箱 */ @Email + @ExcelRequireIgnore private String studentEmail ; /** * 微信 diff --git a/web/src/main/java/com/ibeetl/jlw/entity/dto/TeacherBatchImportDTO.java b/web/src/main/java/com/ibeetl/jlw/entity/dto/TeacherBatchImportDTO.java index ac1f8be9..00d0d7c0 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/dto/TeacherBatchImportDTO.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/dto/TeacherBatchImportDTO.java @@ -1,7 +1,10 @@ package com.ibeetl.jlw.entity.dto; +import com.ibeetl.admin.core.annotation.ExcelRequireIgnore; import com.ibeetl.admin.core.util.excelGroupValidation.ExcelFile; import com.ibeetl.admin.core.util.excelGroupValidation.ExcelValidation; +import com.ibeetl.admin.core.validation.Email; +import com.ibeetl.admin.core.validation.Mobile; import com.ibeetl.jlw.entity.Teacher; import com.ibeetl.jlw.enums.GenderEnum; import lombok.Data; @@ -57,11 +60,15 @@ public class TeacherBatchImportDTO { /** * 电话 */ + @Mobile + @ExcelRequireIgnore private String teacherMobile ; /** * 邮箱 */ + @Email + @ExcelRequireIgnore private String teacherEmail ; /**