美术阅卷11月新增需求-新增打分阶段分档配置

stmms-ms-main/src/main/java/cn/com/qmth/stmms/ms/StartRunning.java

@@ -0,0 +1,45 @@
+package cn.com.qmth.stmms.ms;
+
+import cn.com.qmth.stmms.ms.commons.utils.RandomUtil;
+import cn.com.qmth.stmms.ms.core.domain.Work;
+import cn.com.qmth.stmms.ms.core.repository.WorkRepo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @Description: 服务启动时初始化运行，哪个微服务模块需要则拿此模版去用
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2019/10/11
+ */
+@Component
+public class StartRunning implements CommandLineRunner {
+    private static Logger LOGGER = LoggerFactory.getLogger(StartRunning.class);
+
+    @Autowired
+    private WorkRepo workRepo;
+
+    @Override
+    public void run(String... args) throws Exception {
+        LOGGER.info("服务器启动时执行 start");
+        List<Work> workList = workRepo.findAll();
+        if (Objects.isNull(workList) || workList.size() == 0) {
+            LOGGER.info("没有创建工作区");
+        } else {
+            for (Work work : workList) {
+                if (work.isActive()) {
+                    RandomUtil.getRandom(work.getId(), false);
+                    break;
+                }
+            }
+        }
+        LOGGER.info("服务器启动时执行 end");
+    }
+}

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

@@ -87,8 +87,13 @@ public class StageControlService {
                 break;
             case SCORE:
                 //TODO 进入抽查阶段
-                markSubject.setStage(MarkStage.INSPECT);
-                enterInspectStage(markSubject);
+                if (!markSubject.isAllLevel()) {
+                    markSubject.setStage(MarkStage.SCORE);
+                    enterScoreStage(markSubject);
+                } else {
+                    markSubject.setStage(MarkStage.INSPECT);
+                    enterInspectStage(markSubject);
+                }
                 break;
             case INSPECT:
                 //TODO 结束评卷