修复解绑评卷员续校验打回记录

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

@@ -24,5 +24,6 @@ public interface RejectHistoryDao extends JpaRepository<RejectHistory, Integer>,
 
     @Query("select distinct s.userId from RejectHistory s where s.examId=?1 and s.subjectCode=?2")
     List<Integer> getUserIdByExamIdAndSubjectCode(Integer examId, String subjectCode);
-
+    @Query("select count(*) from RejectHistory f where f.markerId=?1")
+    long countByMarkerId(Integer markerId);
 }

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

@@ -105,4 +105,9 @@ public class RejectHistoryServiceImpl extends BaseQueryService<RejectHistory> im
         return list;
     }
 
+    @Override
+    public long countByMarkerId(Integer markerId) {
+        return historyDao.countByMarkerId(markerId);
+    }
+
 }

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

@@ -14,4 +14,5 @@ public interface RejectHistoryService {
 
     List<User> getUserIdByExamIdAndSubjectCode(int examId, String subjectCode);
 
+    long countByMarkerId(Integer markerId);
 }

stmms-common/src/main/java/cn/com/qmth/stmms/common/utils/VersionInfo.java

@@ -7,5 +7,5 @@ public class VersionInfo {
 
     public static final String NAME = "1.5.1";
 
-    public static final String DATE = "20241101";
+    public static final String DATE = "20241112";
 }

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

@@ -10,6 +10,7 @@ import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.com.qmth.stmms.biz.mark.service.RejectHistoryService;
 import cn.com.qmth.stmms.common.enums.*;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
@@ -111,6 +112,9 @@ public class MarkerController extends BaseExamController {
     @Autowired
     private SchoolService schoolService;
 
+    @Autowired
+    private RejectHistoryService rejectHistoryService;
+
     @Autowired
     private SystemCache systemCache;
 
@@ -562,10 +566,11 @@ public class MarkerController extends BaseExamController {
         }
         long count = libraryService.countByMarker(markerId);
         long trialCount = trialService.countByMarkerIdAndMarkerScoreIsNotNull(markerId);
+        long rejectCount = rejectHistoryService.countByMarkerId(markerId);
         int examId = marker.getExamId();
         String subjectCode = marker.getSubjectCode();
         Integer groupNumber = marker.getGroupNumber();
-        if (count > 0 || trialCount > 0) {
+        if (count > 0 || trialCount > 0 || rejectCount >0 ) {
             addMessage(redirectAttributes, "删除评卷员失败，该评卷员已开始评卷");
         } else {
             try {