复核数量按查询条件变化

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/InspectedController.java

@@ -123,12 +123,8 @@ public class InspectedController extends BaseExamController {
         if (query.getStudentIds() == null || query.getStudentIds().size() != 0) {
             query = studentService.findByQuery(query);
         }
-
-        query.clearStatus();
-        query.addStatus(SubjectiveStatus.MARKED);
-        long inspectCount = studentService.countByQuery(query);
         model.addAttribute("query", query);
-        model.addAttribute("inspectCount", inspectCount);
+        model.addAttribute("inspectCount", query.getTotalCount());
         model.addAttribute("questionList",
                 questionService.findMainByExamAndSubjectAndObjective(examId, query.getSubjectCode(), false));
         model.addAttribute("mainNumber", mainNumber);
@@ -174,10 +170,14 @@ public class InspectedController extends BaseExamController {
             List<Integer> studentIds = scoreService.findStudentIdByQuery(query2);
             query.setStudentIds(studentIds);
         }
-        query = studentService.findByQuery(query);
+        if (query.getStudentIds() == null || query.getStudentIds().size() != 0) {
+            query = studentService.findByQuery(query);
+        }
         List<Integer> ids = new ArrayList<Integer>();
-        for (ExamStudent student : query.getResult()) {
-            ids.add(student.getId());
+        if (query.getResult() != null && query.getResult().size() > 0) {
+            for (ExamStudent student : query.getResult()) {
+                ids.add(student.getId());
+            }
         }
         view.addObject("inspectCount", ids.size());
         view.addObject("fileServer", fileService.getFileServer());