...

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamStudentController.java

@@ -43,6 +43,7 @@ import cn.com.qmth.examcloud.common.dto.core.Course;
 import cn.com.qmth.examcloud.common.dto.examwork.CommonExamStudent;
 import cn.com.qmth.examcloud.commons.base.util.ErrorMsg;
 import cn.com.qmth.examcloud.commons.base.util.excel.ExcelError;
+import cn.com.qmth.examcloud.commons.web.helpers.page.PageInfo;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.basic.api.StudentCloudService;
 import cn.com.qmth.examcloud.core.basic.api.request.InsertOrUpdateStudentReq;
@@ -118,7 +119,7 @@ public class ExamStudentController extends ControllerSupport {
 	 */
 	@ApiOperation(value = "查询考试学生带条件和分页", notes = "带条件带分页")
 	@GetMapping("/all/{curPage}/{pageSize}")
-	public List<ExamStudentDomain> getExamStudentList(
+	public PageInfo<ExamStudentDomain> getExamStudentList(
 			@ModelAttribute ExamStudentDomain examCriteria, @PathVariable Integer curPage,
 			@PathVariable Integer pageSize) {
 		Specification<ExamStudent> specification = (root, query, cb) -> {
@@ -177,6 +178,8 @@ public class ExamStudentController extends ControllerSupport {
 		for (ExamStudent cur : examStudents) {
 			ExamStudentDomain bean = new ExamStudentDomain();
 			bean.setId(cur.getId());
+			bean.setExamId(cur.getExam().getId());
+			bean.setExamName(cur.getExam().getName());
 			bean.setStudentId(cur.getStudentId());
 			bean.setStudentName(cur.getName());
 			bean.setStudentCode(cur.getStudentCode());
@@ -187,7 +190,7 @@ public class ExamStudentController extends ControllerSupport {
 
 			ret.add(bean);
 		}
-		return ret;
+		return new PageInfo<ExamStudentDomain>(examStudents, ret);
 	}
 
 	/**

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/bean/ExamStudentDomain.java

@@ -17,18 +17,20 @@ public class ExamStudentDomain implements JsonSerializable {
 
 	private Long studentId;
 
+	private String identityNumber;
+
 	private String studentName;
 
 	private String studentCode;
 
 	private Long examId;
 
+	private String examName;
+
 	private Long rootOrgId;
 
 	private Long orgId;
 
-	private String identityNumber;
-
 	private String orgCode;
 
 	private String orgName;
@@ -80,6 +82,14 @@ public class ExamStudentDomain implements JsonSerializable {
 		this.studentId = studentId;
 	}
 
+	public String getIdentityNumber() {
+		return identityNumber;
+	}
+
+	public void setIdentityNumber(String identityNumber) {
+		this.identityNumber = identityNumber;
+	}
+
 	public String getStudentName() {
 		return studentName;
 	}
@@ -104,6 +114,14 @@ public class ExamStudentDomain implements JsonSerializable {
 		this.examId = examId;
 	}
 
+	public String getExamName() {
+		return examName;
+	}
+
+	public void setExamName(String examName) {
+		this.examName = examName;
+	}
+
 	public Long getRootOrgId() {
 		return rootOrgId;
 	}
@@ -120,14 +138,6 @@ public class ExamStudentDomain implements JsonSerializable {
 		this.orgId = orgId;
 	}
 
-	public String getIdentityNumber() {
-		return identityNumber;
-	}
-
-	public void setIdentityNumber(String identityNumber) {
-		this.identityNumber = identityNumber;
-	}
-
 	public String getOrgCode() {
 		return orgCode;
 	}