fix

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/model/Marker.java

@@ -98,6 +98,9 @@ public class Marker implements Serializable {
     @Transient
     private long markedCount;
 
+    @Transient
+    private long markedCountNa;
+
     @Transient
     private long currentCount;
 
@@ -378,5 +381,11 @@ public class Marker implements Serializable {
 		this.stdevScoreNa = stdevScoreNa;
 	}
 
+    public long getMarkedCountNa() {
+        return markedCountNa;
+    }
 
+    public void setMarkedCountNa(long markedCountNa) {
+        this.markedCountNa = markedCountNa;
+    }
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/MarkerServiceImpl.java

@@ -94,19 +94,19 @@ public class MarkerServiceImpl extends BaseQueryService<Marker> implements Marke
         List<Object[]> result = libraryDao.countMarkerAndStatus(examId, LibraryStatus.MARKED, LibraryStatus.INSPECTED,
                 LibraryStatus.WAIT_ARBITRATE, LibraryStatus.ARBITRATED);
         try {
-            Map<Integer, Integer> markerMap = new HashMap<>();
+            Map<Integer, Long> markerMap = new HashMap<>();
             if (resultNa != null) {
                 for (int i = 0; i < resultNa.size(); i++) {
                     Object[] array = resultNa.get(i);
-                    markerMap.put((int) array[0], (int) array[1]);
+                    markerMap.put((int) array[0], (long) array[1]);
                 }
             }
             if (result != null) {
                 for (int i = 0; i < result.size(); i++) {
                     Object[] array = result.get(i);
                     Marker marker = findById((int) array[0]);
-                    marker.setFinishCount((int) result.get(i)[1]);
-                    marker.setFinishCountNa(markerMap.get((int) array[0]));
+                    marker.setMarkedCount((long) array[1]);
+                    marker.setMarkedCountNa(markerMap.get((int) array[0])==null?0:markerMap.get((int) array[0]));
                     list.add(marker);
                 }
             }
@@ -125,19 +125,19 @@ public class MarkerServiceImpl extends BaseQueryService<Marker> implements Marke
         List<Object[]> result = libraryDao.countMarkerAndStatusAndSubjectCodeIn(examId, subjectCodes,
                 LibraryStatus.MARKED, LibraryStatus.INSPECTED, LibraryStatus.WAIT_ARBITRATE, LibraryStatus.ARBITRATED);
         try {
-            Map<Integer, Integer> markerMap = new HashMap<>();
+            Map<Integer, Long> markerMap = new HashMap<>();
             if (resultNa != null) {
                 for (int i = 0; i < resultNa.size(); i++) {
                     Object[] array = resultNa.get(i);
-                    markerMap.put((int) array[0], (int) array[1]);
+                    markerMap.put((int) array[0], (long) array[1]);
                 }
             }
             if (result != null) {
                 for (int i = 0; i < result.size(); i++) {
                     Object[] array = result.get(i);
                     Marker marker = findById((int) array[0]);
-                    marker.setFinishCount((int) result.get(i)[1]);
-                    marker.setFinishCountNa(markerMap.get((int) array[0]));
+                    marker.setMarkedCount((long) array[1]);
+                    marker.setMarkedCountNa(markerMap.get((int) array[0])==null?0:markerMap.get((int) array[0]));
                     list.add(marker);
                 }
             }

stmms-web/src/main/java/cn/com/qmth/stmms/admin/dto/MarkerInfoDTO.java

@@ -47,8 +47,8 @@ public class MarkerInfoDTO {
         setGroupNumber(String.valueOf(group.getNumber()));
         setLoginName(marker.getUser().getLoginName());
         setName(marker.getUser().getName());
-        setMarkedCount(marker.getFinishCount() != null ? marker.getFinishCount() : 0);
-        setMarkedCountNa(marker.getFinishCountNa() != null ? marker.getFinishCountNa() : 0);
+        setMarkedCount(marker.getMarkedCount());
+        setMarkedCountNa(marker.getMarkedCountNa());
         setEmpno(marker.getUser().getEmpno());
     }