|
@@ -62,19 +62,23 @@ public class CheckStudentController extends BaseExamController {
|
|
for (CheckStudent c : list) {
|
|
for (CheckStudent c : list) {
|
|
studentIds.add(c.getStudentId());
|
|
studentIds.add(c.getStudentId());
|
|
}
|
|
}
|
|
- ExamStudentSearchQuery sQuery = new ExamStudentSearchQuery();
|
|
|
|
- sQuery.setExamId(examId);
|
|
|
|
- sQuery.setPageNumber(query.getPageNumber());
|
|
|
|
- sQuery.setPageSize(query.getPageSize());
|
|
|
|
- sQuery.setSubjectCode(query.getSubjectCode());
|
|
|
|
- sQuery.setExamSite(query.getExamSite());
|
|
|
|
- sQuery.setStudentIds(studentIds);
|
|
|
|
- List<ExamStudent> studentList = studentService.findByQuery(sQuery).getResult();
|
|
|
|
|
|
+ if (!list.isEmpty()) {
|
|
|
|
+ ExamStudentSearchQuery sQuery = new ExamStudentSearchQuery();
|
|
|
|
+ sQuery.setExamId(examId);
|
|
|
|
+ sQuery.setPageNumber(query.getPageNumber());
|
|
|
|
+ sQuery.setPageSize(query.getPageSize());
|
|
|
|
+ sQuery.setSubjectCode(query.getSubjectCode());
|
|
|
|
+ sQuery.setExamSite(query.getExamSite());
|
|
|
|
+ sQuery.setStudentIds(studentIds);
|
|
|
|
+ List<ExamStudent> studentList = studentService.findByQuery(sQuery).getResult();
|
|
|
|
+ query.setTotalCount(sQuery.getTotalCount());
|
|
|
|
+ query.setTotalPage(sQuery.getTotalPage());
|
|
|
|
+ model.addAttribute("studentList", studentList);
|
|
|
|
+ } else {
|
|
|
|
+ model.addAttribute("studentList", new ArrayList<ExamStudent>());
|
|
|
|
+ }
|
|
model.addAttribute("typeList", CheckType.values());
|
|
model.addAttribute("typeList", CheckType.values());
|
|
- model.addAttribute("studentList", studentList);
|
|
|
|
model.addAttribute("subjectList", getCheckSubject(examId, wu));
|
|
model.addAttribute("subjectList", getCheckSubject(examId, wu));
|
|
- query.setTotalCount(sQuery.getTotalCount());
|
|
|
|
- query.setTotalPage(sQuery.getTotalPage());
|
|
|
|
model.addAttribute("query", query);
|
|
model.addAttribute("query", query);
|
|
return "modules/exam/checkStudent";
|
|
return "modules/exam/checkStudent";
|
|
}
|
|
}
|
|
@@ -109,7 +113,7 @@ public class CheckStudentController extends BaseExamController {
|
|
for (CheckStudent c : list) {
|
|
for (CheckStudent c : list) {
|
|
studentIds.add(c.getStudentId());
|
|
studentIds.add(c.getStudentId());
|
|
}
|
|
}
|
|
- if (StringUtils.isNotBlank(examSite)) {
|
|
|
|
|
|
+ if (StringUtils.isNotBlank(examSite) && !studentIds.isEmpty()) {
|
|
ExamStudentSearchQuery sQuery = new ExamStudentSearchQuery();
|
|
ExamStudentSearchQuery sQuery = new ExamStudentSearchQuery();
|
|
sQuery.setExamId(examId);
|
|
sQuery.setExamId(examId);
|
|
sQuery.setPageSize(Integer.MAX_VALUE);
|
|
sQuery.setPageSize(Integer.MAX_VALUE);
|