美术阅卷12月新增需求-BUG修复

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

@@ -109,5 +109,5 @@ public interface MarkTaskRepo extends JpaRepository<MarkTask, Long>, JpaSpecific
 
     MarkTask findByPaperIdAndMarkerId(Long paperId, Long markId);
 
-    List<MarkTask> findByWorkIdAndSubjectAndStage(Long workId, Subject subject, MarkStage markStage);
+    List<MarkTask> findByWorkId(Long workId);
 }

stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/service/AssignTaskService.java

@@ -60,7 +60,7 @@ public class AssignTaskService {
         if (paperCount % randomBundleSize != 0) {
             randomBundleCount += 1;
         }
-        List<MarkTask> markTaskList = markTaskRepo.findByWorkIdAndSubjectAndStage(markSubject.getWorkId(), markSubject.getSubject(), markSubject.getStage());
+        List<MarkTask> markTaskList = markTaskRepo.findByWorkId(markSubject.getWorkId());
         Map<Long, MarkTask> randomMap = markTaskList.stream().collect(Collectors.toMap(MarkTask::getRandomSeqNew, Function.identity(), (dto1, dto2) -> dto1));
         for (int i = 0; i < randomBundleCount; i++) {
             int fromIndex = i * randomBundleSize;
@@ -117,7 +117,7 @@ public class AssignTaskService {
         Iterator<Paper> iterator = papers.iterator();
         List<MarkTask> markTaskList = new ArrayList<>(papers.size() * sum);
         List<Paper> paperList = new ArrayList<>(papers.size());
-        List<MarkTask> markTasks = markTaskRepo.findByWorkIdAndSubjectAndStage(markSubject.getWorkId(), markSubject.getSubject(), markSubject.getStage());
+        List<MarkTask> markTasks = markTaskRepo.findByWorkId(markSubject.getWorkId());
         Map<Long, MarkTask> randomMap = markTasks.stream().collect(Collectors.toMap(MarkTask::getRandomSeqNew, Function.identity(), (dto1, dto2) -> dto1));
         while (iterator.hasNext()) {
             if (idx >= groupSize) {