ting.yin 8 년 전
부모
커밋
381b57e61e

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

@@ -115,10 +115,6 @@ public class ExamStudentService {
      * @return
      */
     public ExamStudent saveExamStudent(ExamStudent examStudent){
-    	examStudent.setFinished(false);
-    	examStudent.setGraduated(false);
-    	examStudent.setDegree(false);
-    	examStudent.setRepair(false);
         return saveStudent(examStudent);
     }
 
@@ -156,10 +152,6 @@ public class ExamStudentService {
                 ExamStudentDTO dto = (ExamStudentDTO) obj;
                 dto.setRootOrgId(exam.getOrgId());
                 dto.setExam(exam);
-                dto.setFinished(false);
-                dto.setGraduated(false);
-                dto.setDegree(false);
-                dto.setRepair(false);
                 ExcelError error = importCheck(dto);
                 if (error == null) {
                 	examStudents.add(examStudentAssembler.toDomain(dto));
@@ -196,6 +188,10 @@ public class ExamStudentService {
 		student.setUser(user);
 		student = studentService.addStudent(student);
 		examStudent.setStudentId(student.getId());
+		examStudent.setFinished(false);
+		examStudent.setGraduated(false);
+		examStudent.setDegree(false);
+		examStudent.setRepair(false);
 		return examStudentRepo.save(examStudent);
 	}
 	

+ 0 - 1
exam-work-domain/src/main/java/cn/com/qmth/examcloud/service/examwork/dao/ExamStudentRepo.java

@@ -2,7 +2,6 @@ package cn.com.qmth.examcloud.service.examwork.dao;
 
 import java.util.List;
 
-import cn.com.qmth.examcloud.service.examwork.entity.Exam;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;

+ 2 - 1
exam-work-domain/src/main/java/cn/com/qmth/examcloud/service/examwork/dto/ExamStudentDTO.java

@@ -51,7 +51,7 @@ public class ExamStudentDTO {
 	 * 学位
 	 */
 	private Boolean degree;
-
+	@ExcelProperty(index = 6,name = "专业")
 	private String specialtyName;
 	
 	/**
@@ -80,6 +80,7 @@ public class ExamStudentDTO {
 	/**
 	 * 考点
      */
+	@ExcelProperty(index = 7,name = "考点")
 	private String examSite;
 
 	public Long getId() {