Merge branch 'dev_v2.2.0' of http://git.qmth.com.cn/wangliang/distributed-print-service into dev_v2.2.0

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/excel/BasicStudentImportDto.java

@@ -19,7 +19,6 @@ public class BasicStudentImportDto {
     private String studentCode;
 
     @ExcelNote(value = "手机号")
-    @NotNull
     private String phoneNumber;
 
     @ExcelNote(value = "校区")

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -1133,6 +1133,9 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                     if (Objects.isNull(studentName) || studentName.length() > 30) {
                         excelErrorTemp.add(new ExcelError(y + 1, "excel第" + (i + 1) + "个sheet第" + (y + 1) + "行[学生名称]不符合输入规范"));
                     }
+                    if (Objects.nonNull(phoneNumber) && !phoneNumber.matches(SystemConstant.REGULAR_EXPRESSION_OF_PHONE)) {
+                        excelErrorTemp.add(new ExcelError(y + 1, "excel第" + (i + 1) + "个sheet第" + (y + 1) + "行[电话号码]不符合输入规范"));
+                    }
                 }
             }
             if (excelErrorTemp.size() > 0) {