机构版-3.0.0-bug修复-清除当前阶段标记信息

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/service/TrialService.java

@@ -146,8 +146,7 @@ public class TrialService {
         examQuestionRepo.deleteByWorkIdAndSubjectAndTest(workId, subject, TrialEnum.INIT.getId());
         //5.更新该科目下的试卷信息(正式卷子，并删除试评卷子)
         List<Paper> paperList = paperRepo.findByWorkIdAndSubjectAndTest(workId, subject, TrialEnum.START_TRIAL.getId());
-//        List<Long> paperIds = new ArrayList<>();
-        if (Objects.nonNull(paperList) && paperList.size() > 0) {
+        if (Objects.nonNull(paperList) && !paperList.isEmpty()) {
             List<Paper> paperAllList = paperRepo.findByWorkIdAndSubject(workId, subject);
             Map<String, Paper> paperAllMap = paperAllList.stream().filter(o -> (o.getTest() == 0 || o.getTest() == 3))
                     .collect(Collectors.toList())
@@ -162,10 +161,9 @@ public class TrialService {
                         levelMap.put(p.getExamNumber(), p.getLevel());
                     }
                 }
-//                paperIds.add(p.getId());
             });
 
-            if (finalPaperList.size() > 0) {
+            if (!finalPaperList.isEmpty()) {
                 finalPaperList.forEach(o -> {
                     markingService.levelMarkPaper(o, levelMap.get(o.getExamNumber()), true);
                     o.setTest(TrialEnum.DEFAULT.getId());

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

@@ -414,4 +414,8 @@ public interface PaperRepo extends JpaRepository<Paper, Long>, JpaSpecificationE
     @Modifying
     @Query("update Paper s set s.isAdminMark = ?2 where s.id = ?1")
     void updatePaperAdminMarkById(Long paperId, boolean isMark);
+
+    @Modifying
+    @Query("update Paper s set s.isMark = false")
+    void updateIsMarkFalse();
 }

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

@@ -364,6 +364,9 @@ public class AssignTaskService {
             }
             markerGroupRepo.delete(markerGroups);
 
+            // 清空科组长试卷标记
+            paperRepo.updateIsMarkFalse();
+
             //初始化打分任务数据
             initTaskPublishData(markSubject.getWorkId(), markSubject.getSubject().name());
         }

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

@@ -450,6 +450,8 @@ public class MarkingService {
         markUserRepo.updateByWorkIdAndSubject(workId, subject);
         // 删除mark_group分组
         markerGroupRepo.deleteBySubjectAndWorkId(subject, workId);
+        // 清除标记信息
+        paperRepo.updateIsMarkFalse();
         if (MarkStage.SCORE.equals(stage)) {
             // 打分阶段
             // 清除paper中的分数