联考版-迭代

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

@@ -263,12 +263,12 @@ public class AssignTaskService {
         //只有全部任务投放完成，才能删除分组
         int count = paperRepo.countByWorkIdAndSubjectAndIsMissingFalseAndActiveFalseAndBatchNoIsNullAndTest(markSubject.getWorkId(), markSubject.getSubject(), 0);
         //进入分档阶段后，清空当前分组，以便打分阶段前重新分组
-        if (MarkStage.LEVEL.equals(markSubject.getStage()) && count == 0) {
+        /*if (MarkStage.LEVEL.equals(markSubject.getStage()) && count == 0) {
             for (MarkerGroup markerGroup : markerGroups) {
                 markerGroup.setMarkers(null);
             }
             markerGroupRepo.delete(markerGroups);
-        }
+        }*/
 //        if (MarkStage.SCORE.equals(markSubject.getStage()) && count == 0) {
 //            //初始化打分任务数据
 //            initTaskPublishData(markSubject);
@@ -277,7 +277,7 @@ public class AssignTaskService {
     }
 
     @Transactional
-    public void assignForGroupingScore(MarkSubject markSubject) {
+    public void assignForGroupingScore(MarkSubject markSubject, List<MarkerGroup> markerGroups) {
         if (markSubject.getTest() != 1) {
             //更新subject表formal为正试评卷
             markSubject.setFormal(true);
@@ -286,6 +286,10 @@ public class AssignTaskService {
         //只有全部任务投放完成，才能删除分组
         int count = paperRepo.countByWorkIdAndSubjectAndIsMissingFalseAndActiveFalseAndBatchNoIsNullAndTest(markSubject.getWorkId(), markSubject.getSubject(), 0);
         if (MarkStage.SCORE.equals(markSubject.getStage()) && count == 0) {
+            for (MarkerGroup markerGroup : markerGroups) {
+                markerGroup.setMarkers(null);
+            }
+            markerGroupRepo.delete(markerGroups);
             //初始化打分任务数据
             initTaskPublishData(markSubject);
 

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

@@ -336,13 +336,13 @@ public class StageControlService {
             throw new RuntimeException("没有分档完成");
         }
         this.isPtFull(workId, markSubject);
-        /*List<MarkerGroup> markerGroups = markerGroupRepo.findByWorkIdAndSubject(workId, subject);
-        if (markerGroups.size() == 0) {
+        List<MarkerGroup> markerGroups = markerGroupRepo.findByWorkIdAndSubject(workId, subject);
+        /*if (markerGroups.size() == 0) {
             statusMap.put(markSubject.getId(), false);
             throw new RuntimeException("评卷员没有进行分组");
         }*/
         markSubject.setAllLevel(true);
-        assignTaskService.assignForGroupingScore(markSubject);
+        assignTaskService.assignForGroupingScore(markSubject, markerGroups);
     }
 
     @Transactional