|
@@ -100,12 +100,17 @@ public class ExamStudentController {
|
|
|
@AuthValidate("adminUser")
|
|
|
@RequestMapping(value = "/exam/students/{examId}", method = RequestMethod.GET)
|
|
|
@ResponseBody
|
|
|
- public JSONArray getExamStudents(HttpServletRequest request, @PathVariable Integer examId) {
|
|
|
+ public JSONArray getExamStudents(HttpServletRequest request, @PathVariable Integer examId,
|
|
|
+ @RequestParam(required = false) Integer pageNumber, @RequestParam(required = false) Integer pageSize) {
|
|
|
JSONArray array = new JSONArray();
|
|
|
List<ExamStudent> esList = new LinkedList<ExamStudent>();
|
|
|
Exam exam = examService.findById(examId);
|
|
|
+ if (pageNumber == null && pageSize == null) {
|
|
|
+ pageNumber = 1;
|
|
|
+ pageSize = Integer.MAX_VALUE;
|
|
|
+ }
|
|
|
if (exam != null) {
|
|
|
- esList = examStudentService.findByExamId(examId);
|
|
|
+ esList = examStudentService.findByExamId(examId,pageNumber,pageSize);
|
|
|
}
|
|
|
for (ExamStudent student : esList) {
|
|
|
JSONObject obj = new JSONObject();
|
|
@@ -115,6 +120,8 @@ public class ExamStudentController {
|
|
|
obj.accumulate("subjectName", student.getSubjectName());
|
|
|
obj.accumulate("name", student.getName());
|
|
|
obj.accumulate("studentId", String.valueOf(student.getId()));
|
|
|
+ obj.accumulate("studentCode",student.getStudentCode());
|
|
|
+ obj.accumulate("packageCode",student.getPackageCode());
|
|
|
obj.accumulate("barcode", student.getExamNumber());
|
|
|
|
|
|
Campus campus = campusService.findBySchoolAndName(exam.getSchoolId(), student.getCampusName());
|
|
@@ -174,6 +181,9 @@ public class ExamStudentController {
|
|
|
// if (user.getSchoolId() != null) {
|
|
|
// List<Exam> exams = examService.findBySchoolId(user.getSchoolId());
|
|
|
// }
|
|
|
+ if(query.getExamId() == null){
|
|
|
+ return array;
|
|
|
+ }
|
|
|
Exam exam = examService.findById(query.getExamId());
|
|
|
if (exam == null) {
|
|
|
return array;
|