Merge remote-tracking branch 'origin/master'

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

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);
     }
 
@@ -159,10 +155,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));
@@ -199,6 +191,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);
 	}
 	
@@ -232,6 +228,7 @@ public class ExamStudentService {
 		}
 		dto.setOrgId(org.getId());
 		stuCheck(dto);
+		dto.setOrgName(org.getName());
 		return null;
 	}
 
@@ -246,7 +243,7 @@ public class ExamStudentService {
 			dto.setId(examStudent.getId());
 		}
 	}
-	
+
 	/**
 	 * 照片检验
 	 * @param examId
@@ -285,6 +282,9 @@ public class ExamStudentService {
 		    if(!StringUtils.isEmpty(examCriteria.getOrgId())){
 		    	predicates.add(cb.equal(root.get("orgId"),examCriteria.getOrgId()));
 		    }
+		    if(!StringUtils.isEmpty(examCriteria.getOrgName())){
+		    	predicates.add(cb.like(root.get("orgName"),"%"+examCriteria.getOrgName()+"%"));
+		    }
 		    if(!StringUtils.isEmpty(examCriteria.getExamId())){
 		    	predicates.add(cb.equal(root.get("exam").get("id"),examCriteria.getExamId()));
 		    }
@@ -297,6 +297,12 @@ public class ExamStudentService {
 			if(!StringUtils.isEmpty(examCriteria.getCourseCode())){
 				predicates.add(cb.equal(root.get("courseCode"),examCriteria.getCourseCode()));
 			}
+			if(!StringUtils.isEmpty(examCriteria.getCourseLevel())){
+				predicates.add(cb.equal(root.get("courseLevel"),examCriteria.getCourseLevel()));
+			}
+			if(!StringUtils.isEmpty(examCriteria.getCourseName())){
+				predicates.add(cb.like(root.get("courseName"),"%"+examCriteria.getCourseName()+"%"));
+			}
 		    if(!StringUtils.isEmpty(examCriteria.getFinished())){
 		    	predicates.add(cb.equal(root.get("finished"),examCriteria.getFinished()));
 		    }
@@ -306,6 +312,30 @@ public class ExamStudentService {
 			if(!StringUtils.isEmpty(examCriteria.getExamSite())){
 				predicates.add(cb.like(root.get("examSite"),"%"+examCriteria.getExamSite()+"%"));
 			}
+			if(!StringUtils.isEmpty(examCriteria.getIdentityNumber())){
+				predicates.add(cb.equal(root.get("identityNumber"),examCriteria.getIdentityNumber()));
+			}
+			if(!StringUtils.isEmpty(examCriteria.getSpecialtyName())){
+				predicates.add(cb.like(root.get("specialtyName"),"%"+examCriteria.getSpecialtyName()+"%"));
+			}
+			if(!StringUtils.isEmpty(examCriteria.getPaperType())){
+				predicates.add(cb.equal(root.get("paperType"),examCriteria.getPaperType()));
+			}
+			if(!StringUtils.isEmpty(examCriteria.getDegree())){
+				predicates.add(cb.equal(root.get("degree"),examCriteria.getDegree()));
+			}
+			if(!StringUtils.isEmpty(examCriteria.getRepair())){
+				predicates.add(cb.equal(root.get("repair"),examCriteria.getRepair()));
+			}
+			if(!StringUtils.isEmpty(examCriteria.getGraduated())){
+				predicates.add(cb.equal(root.get("graduated"),examCriteria.getGraduated()));
+			}
+			if(!StringUtils.isEmpty(examCriteria.getGrade())){
+				predicates.add(cb.like(root.get("grade"),"%"+examCriteria.getGrade()+"%"));
+			}
+			if(!StringUtils.isEmpty(examCriteria.getExamNumber())){
+				predicates.add(cb.like(root.get("examNumber"),"%"+examCriteria.getExamNumber()+"%"));
+			}
 		    return cb.and(predicates.toArray(new Predicate[predicates.size()]));
 		};
 		return specification;

exam-work-domain/src/main/java/cn/com/qmth/examcloud/service/examwork/assembler/ExamStudentAssembler.java

@@ -54,6 +54,7 @@ public class ExamStudentAssembler {
 			domain.setName(dto.getName());
 			domain.setOrgCode(dto.getOrgCode());
 			domain.setOrgId(dto.getOrgId());
+			domain.setOrgName(dto.getOrgName());
 			domain.setPaperType(dto.getPaperType());
 			domain.setRemark(dto.getRemark());
 			domain.setRepair(dto.getRepair());

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;

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

@@ -26,6 +26,8 @@ public class ExamStudentDTO {
 	 */
     @ExcelProperty(index = 3,name = "学习中心代码")
     private String orgCode;
+    
+    private String orgName;
 
     @ExcelProperty(index = 1,name = "学号")
 	private String studentCode;
@@ -49,7 +51,7 @@ public class ExamStudentDTO {
 	 * 学位
 	 */
 	private Boolean degree;
-
+	@ExcelProperty(index = 6,name = "专业")
 	private String specialtyName;
 	
 	/**
@@ -78,6 +80,7 @@ public class ExamStudentDTO {
 	/**
 	 * 考点
      */
+	@ExcelProperty(index = 7,name = "考点")
 	private String examSite;
 
 	public Long getId() {
@@ -264,6 +267,14 @@ public class ExamStudentDTO {
 		this.examId = examId;
 	}
 
+	public String getOrgName() {
+		return orgName;
+	}
+
+	public void setOrgName(String orgName) {
+		this.orgName = orgName;
+	}
+
 	public ExamStudentDTO() {
 	}
 }