美术阅卷10月新增需求-试评BUG修复

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

@@ -68,6 +68,7 @@ public class TrialService {
         }
         //修改科目test
         markSubject.setTest(TrialEnum.START_FORMAL.getId());
+        markSubject.setFormal(true);
         markSubjectRepo.save(markSubject);
     }
 

stmms-ms-core/src/main/java/cn/com/qmth/stmms/ms/core/domain/MarkSubject.java

@@ -41,6 +41,18 @@ public class MarkSubject implements Serializable {
     @Column(name = "is_test")
     private int test; //是否试评，1:数据已导入，2:试评中，3:正式任务
 
+    @Basic
+    @Column(name = "is_formal")
+    private boolean formal;//是否正评，0:不是，1:是
+
+    public boolean isFormal() {
+        return formal;
+    }
+
+    public void setFormal(boolean formal) {
+        this.formal = formal;
+    }
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }

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

@@ -114,12 +114,9 @@ public class AssignTaskService {
             for (MarkUser marker : markerGroups.get(idx).getMarkers()) {
                 Long random = getRandom(marker.getId(), paper.getId(), marker.getWorkId(), paper.getExamNumber());
                 MarkTask markTask = new MarkTask(marker, paper, markSubject.getStage(), random, markSubject.getTest());
-                if(markSubject.getTest() == 1) {
-                    markTask.setActive(true);
-                }
                 markTaskRepo.save(markTask);
             }
-            if(markSubject.getTest() != 1) {
+            if (markSubject.getTest() != 1) {
                 if (MarkStage.LEVEL.equals(markSubject.getStage())) {
                     //将paper置为激活
                     paper.setActive(true);