修复成绩查询阅卷轨迹显示问题

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/dao/ExamStudentDao.java

@@ -105,7 +105,7 @@ public interface ExamStudentDao
     public List<ExamStudent> findByExamIdAndSubjectCodeAndUploadTimeAfter(int examId, String code, Date date,
             Pageable page);
 
-    @Query("select count(s) from ExamStudent s where s.examId=?1 and s.subjectiveScoreList != null ")
+    @Query("select count(s) from ExamStudent s where s.examId=?1 and s.subjectiveScoreList is not null ")
     public long countByExamIdAndSubjectiveScoreListNotNull(Integer examId);
 
     public List<ExamStudent> findByExamIdAndSubjectCodeAndUploadTimeNotNull(int examId, String code);

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

@@ -869,7 +869,7 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
         int i = -1;
         for (ExamQuestion question : questions) {
             i++;
-            if (question.getMainNumber().equals(group.getNumber())) {
+            if (question.getGroupNumber().equals(group.getNumber())) {
                 double value = scoreList.size() > i ? scoreList.get(i).getScore() : 0;
                 score += value;
                 details.add(value);

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

@@ -296,10 +296,11 @@ public class MarkController extends BaseController {
         Task task = null;
         while (task == null) {
             List<MarkLibrary> list = new ArrayList<MarkLibrary>();
-            if(classes != null){
-                list =  libraryService.findUnMarked(marker.getExamId(), marker.getSubjectCode(),
-                        marker.getGroupNumber(),classes, marker.getId(), retry, 20);
-            }else{
+            // 绑定了班级的评卷员
+            if (classes != null) {
+                list = libraryService.findUnMarked(marker.getExamId(), marker.getSubjectCode(),
+                        marker.getGroupNumber(), classes, marker.getId(), retry, 20);
+            } else {
                 list = libraryService.findUnMarked(marker.getExamId(), marker.getSubjectCode(),
                         marker.getGroupNumber(), marker.getId(), retry, 20);
             }
@@ -307,22 +308,10 @@ public class MarkController extends BaseController {
                 break;
             }
             for (MarkLibrary library : list) {
-//                // 绑定了班级的评卷员
-//                if (classes != null) {
-//                    ExamStudent student = studentService.findById(library.getStudentId());
-//                    if (!classes.contains(student.getClassName())) {
-//                        continue;
-//                    }
-//                    if (markService.applyLibrary(library, marker)) {
-//                        task = taskService.build(library);
-//                        break;
-//                    }
-//                } else {
-                    if (markService.applyLibrary(library, marker)) {
-                        task = taskService.build(library);
-                        break;
-                    }
-//                }
+                if (markService.applyLibrary(library, marker)) {
+                    task = taskService.build(library);
+                    break;
+                }
             }
             if (task == null) {
                 retry++;