3.1.2 fix

stmms-ms-collect/src/main/java/cn/com/qmth/stmms/ms/collect/api/CollectApi.java

@@ -1408,7 +1408,7 @@ public class CollectApi {
      * @param password 密码
      */
     @PostMapping(value = "/validAdminPassword")
-    public boolean validAdminPassword(@RequestParam String password) {
+    public boolean validAdminPassword(@RequestParam(required = false) String password) {
         if (StringUtils.isBlank(password)) {
             throw new RuntimeException("密码长度不能小于6位");
         }

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

@@ -16,6 +16,7 @@ public class ChangeLevelTask {
     private Long id;
 
     private Long workId;
+    private Long changeLevelId;
     private Long questionId;
     @NotNull
     @ManyToOne
@@ -37,9 +38,10 @@ public class ChangeLevelTask {
     @Temporal(value = TemporalType.TIMESTAMP)
     private Date createdOn;
 
-    public static ChangeLevelTask toChangeLevelTask(MarkTaskLevel m, String suggestLevel) {
+    public static ChangeLevelTask toChangeLevelTask(Long changeLevelId, MarkTaskLevel m, String suggestLevel) {
         ChangeLevelTask changeLevelTask = new ChangeLevelTask();
         changeLevelTask.setWorkId(m.getWorkId());
+        changeLevelTask.setChangeLevelId(changeLevelId);
         changeLevelTask.setQuestionId(m.getQuestionId());
         changeLevelTask.setPaper(m.getPaper());
         changeLevelTask.setSubject(m.getSubject().name());
@@ -52,9 +54,10 @@ public class ChangeLevelTask {
         return changeLevelTask;
     }
 
-    public static ChangeLevelTask toChangeLevelTask(MarkTaskScore m, String suggestLevel, Long random) {
+    public static ChangeLevelTask toChangeLevelTask(Long changeLevelId, MarkTaskScore m, String suggestLevel, Long random) {
         ChangeLevelTask changeLevelTask = new ChangeLevelTask();
         changeLevelTask.setWorkId(m.getWorkId());
+        changeLevelTask.setChangeLevelId(changeLevelId);
         changeLevelTask.setQuestionId(m.getQuestionId());
         changeLevelTask.setPaper(m.getPaper());
         changeLevelTask.setSubject(m.getSubject().name());
@@ -85,6 +88,14 @@ public class ChangeLevelTask {
         this.workId = workId;
     }
 
+    public Long getChangeLevelId() {
+        return changeLevelId;
+    }
+
+    public void setChangeLevelId(Long changeLevelId) {
+        this.changeLevelId = changeLevelId;
+    }
+
     public Long getQuestionId() {
         return questionId;
     }

stmms-ms-main/install/mysql/init/stmms_ms.sql

@@ -50,6 +50,7 @@ CREATE TABLE IF NOT EXISTS `change_level`  (
 CREATE TABLE `change_level_task` (
      `id` BIGINT(20) NOT NULL AUTO_INCREMENT,
      `work_id` BIGINT(20) NOT NULL COMMENT '工作ID',
+     `change_level_id` BIGINT(20) NULL COMMENT '改档数据ID',
      `question_id` BIGINT(20) NOT NULL COMMENT '考区ID',
      `paper_id` BIGINT(20) NOT NULL COMMENT '试卷ID',
      `subject` VARCHAR(45) NOT NULL COMMENT '科目',

stmms-ms-main/install/mysql/upgrade/3.1.2.sql

@@ -8,6 +8,7 @@ ADD COLUMN `mark_leader_id` BIGINT(10) NULL COMMENT '细分档阶段科组长操
 CREATE TABLE `change_level_task` (
         `id` BIGINT(20) NOT NULL AUTO_INCREMENT,
         `work_id` BIGINT(20) NOT NULL COMMENT '工作ID',
+        `change_level_id` BIGINT(20) NULL COMMENT '改档数据ID',
         `question_id` BIGINT(20) NOT NULL COMMENT '考区ID',
         `paper_id` BIGINT(20) NOT NULL COMMENT '试卷ID',
         `subject` VARCHAR(45) NOT NULL COMMENT '科目',

stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/api/ChangeLevelApi.java

@@ -298,7 +298,7 @@ public class ChangeLevelApi {
                     markTaskLevelRepo.save(markTasksLevels);
 
                     // 生成确认任务
-                    List<ChangeLevelTask> changeLevelTaskList = markTasksLevels.stream().map(m -> ChangeLevelTask.toChangeLevelTask(m, changeLevel.getSuggestLevel())).collect(Collectors.toList());
+                    List<ChangeLevelTask> changeLevelTaskList = markTasksLevels.stream().map(m -> ChangeLevelTask.toChangeLevelTask(id, m, changeLevel.getSuggestLevel())).collect(Collectors.toList());
                     changeLevelTaskRepo.save(changeLevelTaskList);
                 }
             } else if (MarkStage.SCORE.equals(changeLevel.getStage())) {
@@ -321,7 +321,7 @@ public class ChangeLevelApi {
                     });
                     markTaskScoreRepo.save(markTasksScore);
 
-                    List<ChangeLevelTask> changeLevelTaskList = markTasksScore.stream().map(m -> ChangeLevelTask.toChangeLevelTask(m, changeLevel.getSuggestLevel(), randomUtil.randomLevel(m.getWorkId()))).collect(Collectors.toList());
+                    List<ChangeLevelTask> changeLevelTaskList = markTasksScore.stream().map(m -> ChangeLevelTask.toChangeLevelTask(id, m, changeLevel.getSuggestLevel(), randomUtil.randomLevel(m.getWorkId()))).collect(Collectors.toList());
                     changeLevelTaskRepo.save(changeLevelTaskList);
                 }
             }

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

@@ -2,10 +2,10 @@ package cn.com.qmth.stmms.ms.marking.service;
 
 import cn.com.qmth.stmms.ms.commons.lock.LockService;
 import cn.com.qmth.stmms.ms.commons.lock.LockType;
-import cn.com.qmth.stmms.ms.core.domain.ChangeLevelTask;
-import cn.com.qmth.stmms.ms.core.domain.MarkStage;
-import cn.com.qmth.stmms.ms.core.repository.ChangeLevelTaskRepo;
-import cn.com.qmth.stmms.ms.core.repository.PaperRepo;
+import cn.com.qmth.stmms.ms.core.domain.*;
+import cn.com.qmth.stmms.ms.core.domain.user.Role;
+import cn.com.qmth.stmms.ms.core.repository.*;
+import cn.com.qmth.stmms.ms.core.vo.Subject;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -17,11 +17,17 @@ import java.util.Map;
 @Service
 public class ChangeLevelTaskService {
 
+    @Resource
+    private ChangeLevelRepo changeLevelRepo;
     @Resource
     private ChangeLevelTaskRepo changeLevelTaskRepo;
     @Resource
     private PaperRepo paperRepo;
     @Resource
+    private WorkRepo workRepo;
+    @Resource
+    private MarkLogRepo markLogRepo;
+    @Resource
     private LockService lockService;
 
 
@@ -62,6 +68,13 @@ public class ChangeLevelTaskService {
                 paperRepo.updateLevelByIdAndShift(changeLevelTask.getPaper().getId(), changeLevelTask.getResult());
             }
         }
+
+        // 记录日志
+        Work work = workRepo.findOne(changeLevelTask.getWorkId());
+        Paper paper = changeLevelTask.getPaper();
+        ChangeLevel changeLevel = changeLevelRepo.getOne(changeLevelTask.getChangeLevelId());
+        MarkLog markLog = new MarkLog(changeLevelTask.getWorkId(), work.getName(), paper.getId(), Subject.valueOf(changeLevelTask.getSubject()), changeLevelTask.getStage(), paper.getTest(), paper.getExamNumber(), paper.getStudentName(), changeLevelTask.getMarkerId(), changeLevelTask.getMarkerName(), Role.MARKER, MarkLogOperType.CHANGE_LEVEL.getId(), MarkLogOperType.CHANGE_LEVEL.getName(), changeLevel.getOriginalLevel(), changeLevelTask.getResult(), "", new Date());
+        markLogRepo.save(markLog);
         return true;
     }
 }