fixbugs

stmms-common/src/main/java/cn/com/qmth/stmms/common/enums/HistoryStatus.java

@@ -46,16 +46,4 @@ public enum HistoryStatus {
         }
         return options;
     }
-
-    public static List<HistoryStatus> getProblemStatusList() {
-        if (options == null) {
-            options = new LinkedList<>();
-            for (HistoryStatus status : HistoryStatus.values()) {
-                if (status != MARKED) {
-                    options.add(status);
-                }
-            }
-        }
-        return options;
-    }
 }

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

@@ -167,10 +167,16 @@ public class MarkQualityController extends BaseExamController {
                 List<Object[]> libraries = libraryService.findScoreCount(examId, subjectCode, groupNumber,
                         marker.getId(), LibraryStatus.MARKED, LibraryStatus.INSPECTED);
                 Map<Double, Long> scoreCount = new HashMap<Double, Long>();
+                Long zeroCount = 0l;
                 for (Object[] array : libraries) {
                     Double score = (Double) array[0];
                     Long count = (Long) array[1];
-                    scoreCount.put(score, count);
+                    if (score <= 0) {
+                        zeroCount = zeroCount + count;
+                        scoreCount.put(0d, zeroCount);
+                    } else {
+                        scoreCount.put(score, count);
+                    }
                 }
                 User user = userService.findById(marker.getUserId());
                 MarkerVO vo = new MarkerVO();

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

@@ -56,6 +56,8 @@ public class ProblemHistoryController extends BaseExamController {
 
     protected static Logger log = LoggerFactory.getLogger(ProblemHistoryController.class);
 
+    public static HistoryStatus[] STATUS_LIST = { HistoryStatus.WAITING, HistoryStatus.BACK };
+
     @Autowired
     private ProblemTypeService problemService;
 
@@ -129,7 +131,7 @@ public class ProblemHistoryController extends BaseExamController {
             list.add(student);
         }
         model.addAttribute("resultList", list);
-        model.addAttribute("statusList", HistoryStatus.getProblemStatusList());
+        model.addAttribute("statusList", STATUS_LIST);
         model.addAttribute("query", query);
         model.addAttribute("subjectList", getProblemSubject(examId, wu));
         model.addAttribute("problemList", problemTypes);

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/inspectedList.jsp

@@ -199,6 +199,7 @@
                 $('#question-select').val('').trigger('change');
                 return;
             }
+            $('#question-select').append('<option value="">不限</option>');
             $.post('${ctx}/admin/exam/paper/question/query', {subjectCode: code, status: 'FORMAL'}, function (result) {
                 var parent = $('#question-select');
                 var first = '';