haogh há 1 ano atrás
pai
commit
1cf4930c5b

+ 6 - 6
src/main/java/com/qmth/exam/reserve/service/impl/ExamRoomServiceImpl.java

@@ -116,22 +116,22 @@ public class ExamRoomServiceImpl extends ServiceImpl<ExamRoomDao, ExamRoomEntity
             String name = trimAndNullIfBlank(line.get(EXCEL_HEADER[1]));
             if (StringUtils.isBlank(name)) {
                 msg.append(" 考场名称不能为空");
-            } else if (name.length() > 100) {
-                msg.append(" 考场名称不能超过100个字符");
+            } else if (name.length() > 50) {
+                msg.append(" 考场名称不能超过50个字符");
             } else {
                 room.setName(name);
             }
             String address = trimAndNullIfBlank(line.get(EXCEL_HEADER[2]));
             if (StringUtils.isBlank(address)) {
                 msg.append(" 考场地址不能为空");
-            } else if (address.length() > 200) {
-                msg.append(" 考场地址不能超过200个字符");
+            } else if (address.length() > 100) {
+                msg.append(" 考场地址不能超过100个字符");
             } else {
                 room.setAddress(address);
             }
             String capacity = trimAndNullIfBlank(line.get(EXCEL_HEADER[3]));
-            if (StringUtils.isBlank(capacity) || !capacity.matches("\\d+") || Integer.parseInt(capacity) <= 0) {
-                msg.append(" 考场容量必须为大于0的整数");
+            if (StringUtils.isBlank(capacity) || !capacity.matches("\\d+") || Integer.parseInt(capacity) <= 0 || Integer.parseInt(capacity) > 99999) {
+                msg.append(" 考场容量必须为大于0且小于100000的整数");
             } else {
                 room.setCapacity(Integer.parseInt(capacity));
             }

+ 4 - 4
src/main/java/com/qmth/exam/reserve/service/impl/ExamSiteServiceImpl.java

@@ -161,8 +161,8 @@ public class ExamSiteServiceImpl extends ServiceImpl<ExamSiteDao, ExamSiteEntity
             String name = trimAndNullIfBlank(line.get(EXCEL_HEADER[1]));
             if (StringUtils.isBlank(name)) {
                 msg.append(" 考点名称不能为空");
-            } else if (name.length() > 100) {
-                msg.append(" 考点名称不能超过100个字符");
+            } else if (name.length() > 50) {
+                msg.append(" 考点名称不能超过50个字符");
             } else {
                 List<ExamSiteEntity> examSiteEntities = listExamSiteByName(name);
                 if(examSiteEntities != null && !examSiteEntities.isEmpty()){
@@ -192,8 +192,8 @@ public class ExamSiteServiceImpl extends ServiceImpl<ExamSiteDao, ExamSiteEntity
             String address = trimAndNullIfBlank(line.get(EXCEL_HEADER[3]));
             if (StringUtils.isBlank(address)) {
                 msg.append(" 考点地址不能为空");
-            } else if (address.length() > 200) {
-                msg.append(" 考点地址不能超过200个字符");
+            } else if (address.length() > 100) {
+                msg.append(" 考点地址不能超过100个字符");
             } else {
                 site.setAddress(address);
             }