fixbugs

exam-work-api/src/main/java/cn/com/qmth/examcloud/service/examwork/service/ExamStudentService.java

@@ -6,10 +6,7 @@ import java.util.List;
 
 import javax.persistence.criteria.Predicate;
 
-import cn.com.qmth.examcloud.service.examwork.util.BeanCopierUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Example;
-import org.springframework.data.domain.ExampleMatcher;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
@@ -34,8 +31,6 @@ import cn.com.qmth.examcloud.service.examwork.service.rpc.CourseService;
 import cn.com.qmth.examcloud.service.examwork.service.rpc.OrgService;
 import cn.com.qmth.examcloud.service.examwork.service.rpc.StudentService;
 
-import static org.springframework.data.domain.ExampleMatcher.GenericPropertyMatchers.contains;
-
 /**
  * 考试学生服务类
  * Created by songyue on 17/1/14.
@@ -118,8 +113,12 @@ public class ExamStudentService {
      * @param exam
      * @return
      */
-    public ExamStudent saveExamStudent(ExamStudent exam){
-        return examStudentRepo.save(exam);
+    public ExamStudent saveExamStudent(ExamStudent examStudent){
+    	examStudent.setFinished(false);
+    	examStudent.setGraduated(false);
+    	examStudent.setDegree(false);
+    	examStudent.setRepair(false);
+        return saveStudent(examStudent);
     }
 
     /**
@@ -165,33 +164,37 @@ public class ExamStudentService {
                 	examStudents.add(examStudentAssembler.toDomain(dto));
                 }
                 if (examStudents.size() % 1000 == 0) {
-                    saveExamStudentAndUser(examStudents);
+                	saveStudentList(examStudents);
                 }
                 return error;
             }
 
         });
-        saveExamStudentAndUser(examStudents);
+        saveStudentList(examStudents);
         return excelErrors;
 	}
 	
 
-	private void saveExamStudentAndUser(List<ExamStudent> examStudents) {
+	private void saveStudentList(List<ExamStudent> examStudents) {
 		for (ExamStudent examStudent : examStudents) {
-			Student student = new Student();
-			student.setIdentityNumber(examStudent.getIdentityNumber());
-			student.setName(examStudent.getName());
-			student.setStudentCode(examStudent.getStudentCode());
-			User user = new User();
-			user.setOrgId(examStudent.getOrgId());
-			user.setRootOrgId(examStudent.getRootOrgId());
-			student.setUser(user);
-			student = studentService.addStudent(student);
-			examStudent.setStudentId(student.getId());
-			examStudentRepo.save(examStudent);
+			saveStudent(examStudent);
 		}
 		examStudents.removeAll(examStudents);
 	}
+
+	private ExamStudent saveStudent(ExamStudent examStudent) {
+		Student student = new Student();
+		student.setIdentityNumber(examStudent.getIdentityNumber());
+		student.setName(examStudent.getName());
+		student.setStudentCode(examStudent.getStudentCode());
+		User user = new User();
+		user.setOrgId(examStudent.getOrgId());
+		user.setRootOrgId(examStudent.getRootOrgId());
+		student.setUser(user);
+		student = studentService.addStudent(student);
+		examStudent.setStudentId(student.getId());
+		return examStudentRepo.save(examStudent);
+	}
 	
 	/**
 	 * 考生导入验证