|
@@ -97,11 +97,14 @@ public class InspectedController extends BaseExamController {
|
|
|
}
|
|
|
List<ExamStudent> list = inspectedService.findByQuery(query, status, mainNumber, mainStartScore, mainEndScore,
|
|
|
questionScore);
|
|
|
- Integer count = inspectedService.countByQuery(query, SubjectiveStatus.MARKED, mainNumber, mainStartScore,
|
|
|
- mainEndScore, questionScore);
|
|
|
+ Integer totalCount = inspectedService.countByQuery(query, null, mainNumber, mainStartScore, mainEndScore,
|
|
|
+ questionScore);
|
|
|
+ Integer inspectCount = inspectedService.countByQuery(query, SubjectiveStatus.MARKED, mainNumber,
|
|
|
+ mainStartScore, mainEndScore, questionScore);
|
|
|
query.setResult(list);
|
|
|
+ query.setTotalCount(totalCount);
|
|
|
model.addAttribute("query", query);
|
|
|
- model.addAttribute("inspectCount", count);
|
|
|
+ model.addAttribute("inspectCount", inspectCount);
|
|
|
model.addAttribute("questionList",
|
|
|
questionService.findMainByExamAndSubjectAndObjective(examId, query.getSubjectCode(), false));
|
|
|
model.addAttribute("mainNumber", mainNumber);
|