考生管理采集人，年级，电话字段的添加

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

@@ -371,6 +371,9 @@ public class ExamStudentService {
 			if(!StringUtils.isEmpty(examCriteria.getExamNumber())){
 				predicates.add(cb.like(root.get("examNumber"),"%"+examCriteria.getExamNumber()+"%"));
 			}
+			if(!StringUtils.isEmpty(examCriteria.getInfoCollector())){
+				predicates.add(cb.like(root.get("infoCollector"),"%"+examCriteria.getInfoCollector()+"%"));
+			}
 		    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

@@ -1,68 +1,70 @@
-package cn.com.qmth.examcloud.service.examwork.assembler;
-
-import org.springframework.stereotype.Component;
-
-import cn.com.qmth.examcloud.service.examwork.dto.ExamStudentDTO;
-import cn.com.qmth.examcloud.service.examwork.entity.ExamStudent;
-
-@Component
-public class ExamStudentAssembler {
-	
-	public ExamStudentDTO toDTO(ExamStudent examStudent){
-		ExamStudentDTO dto = null;
-		if(examStudent != null){
-			dto = new ExamStudentDTO();
-			dto.setCourseCode(examStudent.getCourseCode());
-			dto.setCourseLevel(examStudent.getCourseLevel());
-			dto.setCourseName(examStudent.getCourseName());
-			dto.setDegree(examStudent.getDegree());
-			dto.setExam(examStudent.getExam());
-			dto.setExamNumber(examStudent.getExamNumber());
-			dto.setFinished(examStudent.getFinished());
-			dto.setGrade(examStudent.getGrade());
-			dto.setGraduated(examStudent.getGraduated());
-			dto.setId(examStudent.getId());
-			dto.setIdentityNumber(examStudent.getIdentityNumber());
-			dto.setName(examStudent.getName());
-			dto.setOrgCode(examStudent.getOrgCode());
-			dto.setOrgId(examStudent.getOrgId());
-			dto.setRemark(examStudent.getRemark());
-			dto.setPaperType(examStudent.getPaperType());
-			dto.setRepair(examStudent.getRepair());
-			dto.setRootOrgId(examStudent.getRootOrgId());
-			dto.setSpecialtyName(examStudent.getSpecialtyName());
-			dto.setStudentCode(examStudent.getStudentCode());
-		}
-		return dto;
-	}
-	
-	public ExamStudent toDomain(ExamStudentDTO dto){
-		ExamStudent domain = null;
-		if(dto != null){
-			domain = new ExamStudent();
-			domain.setCourseCode(dto.getCourseCode());
-			domain.setCourseLevel(dto.getCourseLevel());
-			domain.setCourseName(dto.getCourseName());
-			domain.setDegree(dto.getDegree());
-			domain.setExam(dto.getExam());
-			domain.setExamNumber(dto.getExamNumber());
-			domain.setFinished(dto.getFinished());
-			domain.setGrade(dto.getGrade());
-			domain.setGraduated(dto.getGraduated());
-			domain.setId(dto.getId());
-			domain.setIdentityNumber(dto.getIdentityNumber());
-			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());
-			domain.setRootOrgId(dto.getRootOrgId());
-			domain.setSpecialtyName(dto.getSpecialtyName());
-			domain.setStudentCode(dto.getStudentCode());
-		}
-		return domain;
-	}
-	
-}
+package cn.com.qmth.examcloud.service.examwork.assembler;
+
+import org.springframework.stereotype.Component;
+
+import cn.com.qmth.examcloud.service.examwork.dto.ExamStudentDTO;
+import cn.com.qmth.examcloud.service.examwork.entity.ExamStudent;
+
+@Component
+public class ExamStudentAssembler {
+	
+	public ExamStudentDTO toDTO(ExamStudent examStudent){
+		ExamStudentDTO dto = null;
+		if(examStudent != null){
+			dto = new ExamStudentDTO();
+			dto.setCourseCode(examStudent.getCourseCode());
+			dto.setCourseLevel(examStudent.getCourseLevel());
+			dto.setCourseName(examStudent.getCourseName());
+			dto.setDegree(examStudent.getDegree());
+			dto.setExam(examStudent.getExam());
+			dto.setExamNumber(examStudent.getExamNumber());
+			dto.setFinished(examStudent.getFinished());
+			dto.setGrade(examStudent.getGrade());
+			dto.setGraduated(examStudent.getGraduated());
+			dto.setId(examStudent.getId());
+			dto.setIdentityNumber(examStudent.getIdentityNumber());
+			dto.setName(examStudent.getName());
+			dto.setOrgCode(examStudent.getOrgCode());
+			dto.setOrgId(examStudent.getOrgId());
+			dto.setRemark(examStudent.getRemark());
+			dto.setPaperType(examStudent.getPaperType());
+			dto.setRepair(examStudent.getRepair());
+			dto.setRootOrgId(examStudent.getRootOrgId());
+			dto.setSpecialtyName(examStudent.getSpecialtyName());
+			dto.setStudentCode(examStudent.getStudentCode());
+		}
+		return dto;
+	}
+	
+	public ExamStudent toDomain(ExamStudentDTO dto){
+		ExamStudent domain = null;
+		if(dto != null){
+			domain = new ExamStudent();
+			domain.setCourseCode(dto.getCourseCode());
+			domain.setCourseLevel(dto.getCourseLevel());
+			domain.setCourseName(dto.getCourseName());
+			domain.setDegree(dto.getDegree());
+			domain.setExam(dto.getExam());
+			domain.setExamNumber(dto.getExamNumber());
+			domain.setFinished(dto.getFinished());
+			domain.setGrade(dto.getGrade());
+			domain.setGraduated(dto.getGraduated());
+			domain.setId(dto.getId());
+			domain.setIdentityNumber(dto.getIdentityNumber());
+			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());
+			domain.setRootOrgId(dto.getRootOrgId());
+			domain.setSpecialtyName(dto.getSpecialtyName());
+			domain.setStudentCode(dto.getStudentCode());
+			domain.setInfoCollector(dto.getInfoCollector());
+			domain.setPhone(dto.getPhone());
+		}
+		return domain;
+	}
+	
+}

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

@@ -59,10 +59,7 @@ public class ExamStudentDTO {
 	 */
 	private Boolean repair;
 	
-	/**
-	 * 年级
-	 */
-	private String grade;
+	
 	/**
 	 * 是否毕业
 	 */
@@ -83,6 +80,18 @@ public class ExamStudentDTO {
 	@ExcelProperty(index = 7,name = "考点")
 	private String examSite;
 
+	@ExcelProperty(index = 8,name = "信息采集人")
+	private String infoCollector;
+	
+	@ExcelProperty(index = 9,name = "学生电话")
+	private String phone;
+	
+	/**
+	 * 年级
+	 */
+	@ExcelProperty(index = 10,name = "学生电话")
+	private String grade;
+	
 	public Long getId() {
 		return id;
 	}
@@ -274,6 +283,22 @@ public class ExamStudentDTO {
 	public void setOrgName(String orgName) {
 		this.orgName = orgName;
 	}
+	
+	public String getInfoCollector() {
+		return infoCollector;
+	}
+
+	public void setInfoCollector(String infoCollector) {
+		this.infoCollector = infoCollector;
+	}
+
+	public String getPhone() {
+		return phone;
+	}
+
+	public void setPhone(String phone) {
+		this.phone = phone;
+	}
 
 	public ExamStudentDTO() {
 	}

exam-work-domain/src/main/java/cn/com/qmth/examcloud/service/examwork/entity/ExamStudent.java

@@ -93,6 +93,16 @@ public class ExamStudent implements Serializable {
 	 * 考点
 	 */
 	private String examSite;
+	
+	/**
+	 * 信息采集人
+	 */
+	private String infoCollector;
+	
+	/**
+	 * 学生电话
+	 */
+	private String phone;
 
 	public static long getSerialVersionUID() {
 		return serialVersionUID;
@@ -285,6 +295,23 @@ public class ExamStudent implements Serializable {
 	public void setOrgName(String orgName) {
 		this.orgName = orgName;
 	}
+	
+
+	public String getInfoCollector() {
+		return infoCollector;
+	}
+
+	public void setInfoCollector(String infoCollector) {
+		this.infoCollector = infoCollector;
+	}
+
+	public String getPhone() {
+		return phone;
+	}
+
+	public void setPhone(String phone) {
+		this.phone = phone;
+	}
 
 	public ExamStudent() {
 	}