浏览代码

fix:去掉字段长度限制

caozixuan 2 年之前
父节点
当前提交
2eea177e76

+ 1 - 4
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskServiceImpl.java

@@ -2159,12 +2159,9 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                     }
 
                     excelErrorTemp.addAll(ExcelUtil.checkExcelField(examStudentImportDto, y, i));
-                    if (Objects.isNull(studentCode) || studentCode.length() > 30 || !studentCode.matches(SystemConstant.REGULAR_EXPRESSION_OF_CODE)) {
+                    if (Objects.nonNull(studentCode) && !studentCode.matches(SystemConstant.REGULAR_EXPRESSION_OF_CODE)) {
                         excelErrorTemp.add(new ExcelError(y + 1, "excel第" + (i + 1) + "个sheet第" + (y + 1) + "行[学号]不符合输入规范"));
                     }
-                    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) + "行[电话号码]不符合输入规范"));
                     }

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

@@ -1531,11 +1531,8 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                         checkDtoMap.put(code, sysUserImportDto);
                     }
 
-                    if (Objects.isNull(code) || code.length() > 30 || !code.matches(SystemConstant.REGULAR_EXPRESSION_OF_CODE)) {
-                        errorStringJoiner.add("[工号]不符合规范,最长30个字符");
-                    }
-                    if (Objects.isNull(name) || name.length() > 30) {
-                        errorStringJoiner.add("[姓名]不符合输入规范,最长30个字符");
+                    if (Objects.nonNull(code) && !code.matches(SystemConstant.REGULAR_EXPRESSION_OF_CODE)) {
+                        errorStringJoiner.add("[工号]不符合规范");
                     }
                     if (Objects.nonNull(phoneNumber) && !phoneNumber.matches(SystemConstant.REGULAR_EXPRESSION_OF_PHONE)) {
                         errorStringJoiner.add("[手机号]不符合输入规范");
@@ -1591,9 +1588,6 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                     }
 
                     excelErrorTemp.addAll(ExcelUtil.checkExcelField(basicClazzImportDto, y, i));
-                    if (Objects.isNull(clazzName) || clazzName.length() > 50) {
-                        excelErrorTemp.add(new ExcelError(y + 1, "excel第" + (i + 1) + "个sheet第" + (y + 1) + "行[学号]不符合输入规范"));
-                    }
                 }
             }
             if (excelErrorTemp.size() > 0) {

+ 1 - 4
teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/BasicCourseServiceImpl.java

@@ -278,12 +278,9 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
                     }
 
                     excelErrorTemp.addAll(ExcelUtil.checkExcelField(basicCourseImportDto, y, i));
-                    if (Objects.isNull(courseCode) || courseCode.length() > 30 || !courseCode.matches(SystemConstant.REGULAR_EXPRESSION_OF_CODE)) {
+                    if (Objects.nonNull(courseCode) && !courseCode.matches(SystemConstant.REGULAR_EXPRESSION_OF_CODE)) {
                         excelErrorTemp.add(new ExcelError(y + 1, "excel第" + (i + 1) + "个sheet第" + (y + 1) + "行[课程编号]不符合输入规范"));
                     }
-                    if (Objects.isNull(courseName) || courseName.length() > 30) {
-                        excelErrorTemp.add(new ExcelError(y + 1, "excel第" + (i + 1) + "个sheet第" + (y + 1) + "行[课程名称]不符合输入规范"));
-                    }
                     if ((Objects.nonNull(name) && !Objects.equals(name.trim(), "")) && (Objects.isNull(code) || Objects.equals(code.trim(), ""))) {
                         excelErrorTemp.add(new ExcelError(y + 1, "excel第" + (i + 1) + "个sheet第" + (y + 1) + "行[工号]不能为空"));
                     }