fixbugs

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

@@ -41,8 +41,9 @@ public interface MarkLibraryDao extends JpaRepository<MarkLibrary, Integer>, Jpa
 
     List<MarkLibrary> findByStudentIdAndGroupNumber(Integer studentId, Integer groupNumber);
 
+    @Query("select l from MarkLibrary l where l.studentId=?1 and l.groupNumber=?2 and l.status in (?3) ")
     List<MarkLibrary> findByStudentIdAndGroupNumberAndStatus(Integer studentId, Integer groupNumber,
-            LibraryStatus status);
+            LibraryStatus... status);
 
     @Query("select count(*) from MarkLibrary f where f.examId=?1 and f.subjectCode=?2 and f.groupNumber=?3")
     long countByExamIdAndSubjectCodeAndGroupNumber(Integer examId, String subjectCode, Integer groupNumber);

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/Impl/MarkServiceImpl.java

@@ -504,7 +504,7 @@ public class MarkServiceImpl implements MarkService {
         if (group.getArbitrateThreshold() != null && group.getArbitrateThreshold() > 0) {
             // 多评模式
             List<MarkLibrary> list = libraryDao.findByStudentIdAndGroupNumberAndStatus(library.getStudentId(),
-                    library.getGroupNumber(), LibraryStatus.MARKED);
+                    library.getGroupNumber(), LibraryStatus.MARKED, LibraryStatus.INSPECTED);
             for (MarkLibrary other : list) {
                 if (other.getId().equals(library.getId()) || other.getHeaderScore() != null) {
                     // 本评卷任务或组长已打分，则跳过该任务

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

@@ -128,6 +128,8 @@ $(document).ready(function() {
 });
 
 function process(index){
+	$('#progress').html(ids.length);
+	
     if(index<1){
         return;
     }
@@ -162,7 +164,7 @@ function onProcessFinish(error) {
 }
 
 function render(){
-    $('#progress').html(ids.length);
+    
     $('#studentId').html(student.studentId);
     $('#subject').html(student.subjectCode+'_'+student.subjectName);
     $('#markerName').html(student.markerName);