增加考生检索条件

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

@@ -266,6 +266,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()));
 		    }
@@ -278,6 +281,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()));
 		    }
@@ -290,6 +299,27 @@ public class ExamStudentService {
 			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;