更新评卷端已评数修改为包含评卷员待仲裁和已仲裁的数量，评卷员工作量导出也修改为包含仲裁、不含仲裁

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

@@ -88,7 +88,7 @@ public class MarkerServiceImpl extends BaseQueryService<Marker> implements Marke
     @Override
     public List<Marker> getMarkCount(int examId) {
         List<Marker> list = new LinkedList<Marker>();
-        List<Object[]> result = libraryDao.countMarkerAndStatus(examId, LibraryStatus.MARKED, LibraryStatus.INSPECTED);
+        List<Object[]> result = libraryDao.countMarkerAndStatus(examId, LibraryStatus.MARKED, LibraryStatus.INSPECTED, LibraryStatus.WAIT_ARBITRATE, LibraryStatus.ARBITRATED);
         if (result != null) {
             for (Object[] array : result) {
                 try {
@@ -106,7 +106,7 @@ public class MarkerServiceImpl extends BaseQueryService<Marker> implements Marke
     public List<Marker> getMarkCount(int examId, Set<String> subjectCodes) {
         List<Marker> list = new LinkedList<Marker>();
         List<Object[]> result = libraryDao.countMarkerAndStatusAndSubjectCodeIn(examId, subjectCodes,
-                LibraryStatus.MARKED, LibraryStatus.INSPECTED);
+                LibraryStatus.MARKED, LibraryStatus.INSPECTED, LibraryStatus.WAIT_ARBITRATE, LibraryStatus.ARBITRATED);
         if (result != null) {
             for (Object[] array : result) {
                 try {

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

@@ -34,7 +34,10 @@ public class MarkerInfoDTO {
     @ExcelField(title = "评卷数量", align = 2, sort = 90)
     private long markedCount;
 
-    @ExcelField(title = "学院", align = 2, sort = 100)
+    @ExcelField(title = "评卷数量（不含仲裁）", align = 2, sort = 100)
+    private long markedCountNa;
+
+    @ExcelField(title = "学院", align = 2, sort = 110)
     private String college;
 
     public MarkerInfoDTO(Marker marker, ExamSubject subject, MarkGroup group) {
@@ -44,7 +47,8 @@ public class MarkerInfoDTO {
         setGroupNumber(String.valueOf(group.getNumber()));
         setLoginName(marker.getUser().getLoginName());
         setName(marker.getUser().getName());
-        setMarkedCount(marker.getMarkedCount());
+        setMarkedCount(marker.getFinishCount());
+        setMarkedCountNa(marker.getFinishCountNa());
         setEmpno(marker.getUser().getEmpno());
     }
 
@@ -127,4 +131,12 @@ public class MarkerInfoDTO {
     public void setCollege(String college) {
         this.college = college;
     }
+
+    public long getMarkedCountNa() {
+        return markedCountNa;
+    }
+
+    public void setMarkedCountNa(long markedCountNa) {
+        this.markedCountNa = markedCountNa;
+    }
 }

stmms-web/src/main/java/cn/com/qmth/stmms/mark/MarkController.java

@@ -390,6 +390,8 @@ public class MarkController extends BaseController {
             query.setMarkerId(marker.getId());
             query.addStatus(LibraryStatus.MARKED);
             query.addStatus(LibraryStatus.INSPECTED);
+            query.addStatus(LibraryStatus.ARBITRATED);
+            query.addStatus(LibraryStatus.WAIT_ARBITRATE);
             personCount = libraryService.countByQuery(query);
             if (classCount > 0) {
                 markedCount = libraryService.countMarkedByExamAndSubjectAndGroupAndFilterClass(marker.getExamId(),
@@ -397,6 +399,9 @@ public class MarkController extends BaseController {
                         LibraryStatus.INSPECTED, LibraryStatus.ARBITRATED);
             } else {
                 query.setMarkerId(0);
+                query.clearStatus();
+                query.addStatus(LibraryStatus.MARKED);
+                query.addStatus(LibraryStatus.INSPECTED);
                 query.addStatus(LibraryStatus.ARBITRATED);
                 markedCount = libraryService.countByQuery(query);
             }