bugfix

themis-business/src/main/java/com/qmth/themis/business/dto/ExamStudentImportDto.java

@@ -4,6 +4,7 @@ import com.qmth.themis.business.annotation.ExcelNote;
 
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.util.Objects;
 
 /**
  * @Description: 考生导入dto
@@ -71,74 +72,74 @@ public class ExamStudentImportDto implements Serializable {
     }
 
     public String getName() {
-        return name;
+        return Objects.nonNull(name) ? name.trim() : name;
     }
 
     public void setName(String name) {
-        this.name = name;
+        this.name = Objects.nonNull(name) ? name.trim() : name;
     }
 
     public String getIdentity() {
-        return identity;
+        return Objects.nonNull(identity) ? identity.trim() : identity;
     }
 
     public void setIdentity(String identity) {
-        this.identity = identity;
+        this.identity = Objects.nonNull(identity) ? identity.trim() : identity;
     }
 
     public String getCourseCode() {
-        return courseCode;
+        return Objects.nonNull(courseCode) ? courseCode.trim() : courseCode;
     }
 
     public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
+        this.courseCode = Objects.nonNull(courseCode) ? courseCode.trim() : courseCode;
     }
 
     public String getCourseName() {
-        return courseName;
+        return Objects.nonNull(courseName) ? courseName.trim() : courseName;
     }
 
     public void setCourseName(String courseName) {
-        this.courseName = courseName;
+        this.courseName = Objects.nonNull(courseName) ? courseName.trim() : courseName;
     }
 
     public String getGrade() {
-        return grade;
+        return Objects.nonNull(grade) ? grade.trim() : grade;
     }
 
     public void setGrade(String grade) {
-        this.grade = grade;
+        this.grade = Objects.nonNull(grade) ? grade.trim() : grade;
     }
 
     public String getClassNo() {
-        return classNo;
+        return Objects.nonNull(classNo) ? classNo.trim() : classNo;
     }
 
     public void setClassNo(String classNo) {
-        this.classNo = classNo;
+        this.classNo = Objects.nonNull(classNo) ? classNo.trim() : classNo;
     }
 
     public String getExamActivityCode() {
-        return examActivityCode;
+        return Objects.nonNull(examActivityCode) ? examActivityCode.trim() : examActivityCode;
     }
 
     public void setExamActivityCode(String examActivityCode) {
-        this.examActivityCode = examActivityCode;
+        this.examActivityCode = Objects.nonNull(examActivityCode) ? examActivityCode.trim() : examActivityCode;
     }
 
     public String getRoomCode() {
-        return roomCode;
+        return Objects.nonNull(roomCode) ? roomCode.trim() : roomCode;
     }
 
     public void setRoomCode(String roomCode) {
-        this.roomCode = roomCode;
+        this.roomCode = Objects.nonNull(roomCode) ? roomCode.trim() : roomCode;
     }
 
     public String getRoomName() {
-        return roomName;
+        return Objects.nonNull(roomName) ? roomName.trim() : roomName;
     }
 
     public void setRoomName(String roomName) {
-        this.roomName = roomName;
+        this.roomName = Objects.nonNull(roomName) ? roomName.trim() : roomName;
     }
 }

themis-business/src/main/java/com/qmth/themis/business/dto/RoomCodeImportDto.java

@@ -4,6 +4,7 @@ import com.qmth.themis.business.annotation.ExcelNote;
 
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.util.Objects;
 
 /**
  * @Description: 考场导入dto
@@ -65,42 +66,42 @@ public class RoomCodeImportDto implements Serializable {
     }
 
     public String getRoomCode() {
-        return roomCode;
+        return Objects.nonNull(roomCode) ? roomCode.trim() : roomCode;
     }
 
     public void setRoomCode(String roomCode) {
-        this.roomCode = roomCode;
+        this.roomCode = Objects.nonNull(roomCode) ? roomCode.trim() : roomCode;
     }
 
     public String getRoomName() {
-        return roomName;
+        return Objects.nonNull(roomName) ? roomName.trim() : roomName;
     }
 
     public void setRoomName(String roomName) {
-        this.roomName = roomName;
+        this.roomName = Objects.nonNull(roomName) ? roomName.trim() : roomName;
     }
 
     public String getTeacher1() {
-        return teacher1;
+        return Objects.nonNull(teacher1) ? teacher1.trim() : teacher1;
     }
 
     public void setTeacher1(String teacher1) {
-        this.teacher1 = teacher1;
+        this.teacher1 = Objects.nonNull(teacher1) ? teacher1.trim() : teacher1;
     }
 
     public String getTeacher2() {
-        return teacher2;
+        return Objects.nonNull(teacher2) ? teacher2.trim() : teacher2;
     }
 
     public void setTeacher2(String teacher2) {
-        this.teacher2 = teacher2;
+        this.teacher2 = Objects.nonNull(teacher2) ? teacher2.trim() : teacher2;
     }
 
     public String getTeacher3() {
-        return teacher3;
+        return Objects.nonNull(teacher3) ? teacher3.trim() : teacher3;
     }
 
     public void setTeacher3(String teacher3) {
-        this.teacher3 = teacher3;
+        this.teacher3 = Objects.nonNull(teacher3) ? teacher3.trim() : teacher3;
     }
 }