测试bug修复-修改考生-0817

sql/美术阅卷表结构修改-202006.sql

@@ -40,6 +40,7 @@ COMMENT = '改档记录表';
 CREATE TABLE `task_publish_setting` (
   `id` BIGINT(20) NOT NULL AUTO_INCREMENT,
   `work_id` BIGINT(20) NULL,
+  `question_id` BIGINT(20) NULL,
   `subject` VARCHAR(50) NULL,
   `code` VARCHAR(45) NULL COMMENT '档位',
   `total_count` INT NULL COMMENT '总数量',

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/api/StudentApi.java

@@ -99,6 +99,7 @@ public class StudentApi {
         domain.setAreaCode(student.getAreaCode());
         domain.setAreaName(student.getAreaName());
         domain.setSchool(student.getSchool());
+        domain.setRelateExamNumber(student.getExamNumber());
         return studentRepo.save(domain);
     }
 

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

@@ -134,20 +134,22 @@ public class AssignTaskService {
             Paper paper = iterator.next();
             String serialNumber = null;
             Integer displayNumber = null;
-            //是否定序
-            int seq=0;
-            long sortRule = taskList.stream().filter(m->Objects.equals(m.getCode(), paper.getLevel())&& m.getSortRule() == 1).count();
-            if(sortRule !=0) {
-                if(map.containsKey(paper.getLevel() + idx)){
-                    seq = (int) map.get(paper.getLevel() + idx);
+            if (Objects.equals(MarkStage.SCORE, markSubject.getStage())) {
+                //是否定序
+                int seq = 0;
+                long sortRule = taskList.stream().filter(m -> Objects.equals(m.getCode(), paper.getLevel()) && m.getSortRule() == 1).count();
+                if (sortRule != 0) {
+                    if (map.containsKey(paper.getLevel() + idx)) {
+                        seq = (int) map.get(paper.getLevel() + idx);
+                    }
+                    seq = ++seq;
+                    serialNumber = paper.getLevel() + seq;
+                    //是否显示序号
+                    long display = taskList.stream().filter(m -> Objects.equals(m.getCode(), paper.getLevel()) && m.getDisplayNumber() == 1).count();
+                    displayNumber = (int) display;
+                    //设置新值
+                    map.put(paper.getLevel() + idx, seq);
                 }
-                seq = ++seq;
-                serialNumber = paper.getLevel() + seq;
-                //是否显示序号
-                long display = taskList.stream().filter(m->Objects.equals(m.getCode(), paper.getLevel())&& m.getDisplayNumber() == 1).count();
-                displayNumber = (int) display;
-                //设置新值
-                map.put(paper.getLevel()+ idx, seq);
             }
             for (MarkUser marker : markerGroups.get(idx).getMarkers()) {
                 Long random = getRandom(marker.getId(), paper.getId(), marker.getWorkId(), paper.getExamNumber(), randomMap);