fix bugs

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/dao/MarkLibraryDao.java

@@ -128,11 +128,11 @@ public interface MarkLibraryDao extends JpaRepository<MarkLibrary, Integer>, Jpa
     int updateMarkerResult(Integer id, LibraryStatus newStatus, Integer markerId, Double markerScore,
             String markerScoreList, Date markerTime, Integer spent, String resson, LibraryStatus... previousStatus);
 
-    @Query("select m.markerScore ,count(m) from MarkLibrary m where m.examId=?1 and m.subjectCode=?2 and m.groupNumber=?3 and m.markerId=?4 and m.status in (?5) group by m.markerScore ")
+    @Query("select m.markerScore ,count(m) from MarkLibrary m where m.examId=?1 and m.subjectCode=?2 and m.groupNumber=?3 and m.markerId=?4 and m.markerScore != -1 and m.status in (?5)  group by m.markerScore ")
     List<Object[]> findScoreCount(int examId, String subjectCode, Integer groupNumber, Integer markerId,
             LibraryStatus... status);
 
-    @Query("select m.markerScore from MarkLibrary m where m.examId=?1 and m.subjectCode=?2 and m.groupNumber=?3 and m.status in (?4) group by m.markerScore ")
+    @Query("select m.markerScore from MarkLibrary m where m.examId=?1 and m.subjectCode=?2 and m.groupNumber=?3 and m.markerScore !=-1 and m.status in (?4) group by m.markerScore ")
     List<Double> findScore(int examId, String subjectCode, Integer groupNumber, LibraryStatus... status);
 
     @Modifying

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

@@ -167,16 +167,10 @@ 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];
-                    if (score <= 0) {
-                        zeroCount = zeroCount + count;
-                        scoreCount.put(0d, zeroCount);
-                    } else {
-                        scoreCount.put(score, count);
-                    }
+                    scoreCount.put(score, count);
                 }
                 User user = userService.findById(marker.getUserId());
                 MarkerVO vo = new MarkerVO();