考生导入学号必填

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/StudentController.java

@@ -130,12 +130,13 @@ public class StudentController extends BaseExamController {
                 ExamStudent previous = studentService.findById(student.getId());
                 if (previous != null) {
                 	// String previousSubjectCode = previous.getSubjectCode();
+                	student.setExamId(examId);
+                	ExamStudent old = checkExamNumber(student, new HashMap<String, ExamStudent>(), new HashMap<String, ExamStudent>());
+                	if(old !=null && !old.getExamNumber().equals(previous.getExamNumber())){
+                		addMessage(redirectAttributes, "准考证号" + student.getExamNumber() + "已经存在");
+                		return "redirect:/admin/exam/student";
+                	}
                 	if (!previous.isUpload()) {
-                		ExamStudent old = checkExamNumber(student, new HashMap<String, ExamStudent>(), new HashMap<String, ExamStudent>());
-                		if(old !=null && !old.getExamNumber().equals(previous.getExamNumber())){
-                			addMessage(redirectAttributes, "准考证号" + student.getExamNumber() + "已经存在");
-                			return "redirect:/admin/exam/student";
-                		}
                         // 还未扫描上传的考生，才能修改准考证号、学习中心、科目
                         previous.setCampusName(student.getCampusName());
                         previous.setSubjectCode(subject.getCode());
@@ -253,7 +254,8 @@ public class StudentController extends BaseExamController {
                         || StringUtils.isBlank(student.getCampusName())
                         || StringUtils.isBlank(student.getCollege())
                         || StringUtils.isBlank(student.getClassName())
-                        || StringUtils.isBlank(student.getTeacher())) {
+                        || StringUtils.isBlank(student.getTeacher())
+                        || StringUtils.isBlank(student.getStudentCode()) ) {
                     continue;
                 }