机构版-迭代

stmms-ms-accesscontrol/src/main/java/cn/com/qmth/stmms/ms/accesscontrol/api/AuthApi.java

@@ -74,7 +74,7 @@ public class AuthApi {
 
         if (Objects.equals(Role.MARKER, domain.getRole())) {
             MarkSubject markSubject = markSubjectRepo.findOne(domain.getWorkId() + "-" + domain.getSubject().name());
-            List<MarkTask> markTasks = markTaskRepo.findByWorkIdAndSubjectAndMarkerIdAndStage(domain.getWorkId(), domain.getSubject(), domain.getId(), markSubject.getStage());
+            List<MarkTask> markTasks = markTaskRepo.findByWorkIdAndSubjectAndMarkerIdAndStage(domain.getWorkId(), domain.getSubject().name(), domain.getId(), markSubject.getStage().ordinal());
             if (CollectionUtils.isEmpty(markTasks)) {
                 throw new RuntimeException("没有评卷任务");
             }

stmms-ms-core/src/main/java/cn/com/qmth/stmms/ms/core/repository/MarkTaskRepo.java

@@ -228,7 +228,8 @@ public interface MarkTaskRepo extends JpaRepository<MarkTask, Long>, JpaSpecific
     @Query(value = "SELECT count(1) from mark_task m where m.question_id = ?1 and m.marker_id = ?2 and m.stage = ?3 and  m.batch_no is not null and m.is_rejected = true", nativeQuery = true)
     int countByQuestionIdAndMarkerIdAndStageAndIsRejectedTrue(Long questionId, Long markerId, int ordinal);
 
-    List<MarkTask> findByWorkIdAndSubjectAndMarkerIdAndStage(Long workId, Subject subject, Long valueOf, MarkStage stage);
+    @Query(value = "select * from mark_task where work_id = ?1 and subject = ?2 and marker_id = ?3 and stage = ?4 limit 1", nativeQuery = true)
+    List<MarkTask> findByWorkIdAndSubjectAndMarkerIdAndStage(Long workId, String subject, Long valueOf, int stage);
 
     int countByWorkIdAndStageAndResultNotNull(Long id, MarkStage level);