机构版-迭代

sql/美术-线上-最新数据结构-20201116.sql → sql/msyj-org-20210628.sql

@@ -5,13 +5,13 @@
  Source Server Type    : MySQL
  Source Server Version : 50717
  Source Host           : localhost:3306
- Source Schema         : chuanyin-2020-v2.0
+ Source Schema         : msyj-org-2.0.0-xh
 
  Target Server Type    : MySQL
  Target Server Version : 50717
  File Encoding         : 65001
 
- Date: 27/01/2021 16:50:34
+ Date: 24/06/2021 15:58:02
 */
 
 SET NAMES utf8mb4;
@@ -38,7 +38,7 @@ CREATE TABLE `attachment`  (
   `delete_status` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `time` datetime(0) NOT NULL,
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 509 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for change_level
@@ -58,7 +58,7 @@ CREATE TABLE `change_level`  (
   `suggest_level` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `is_curr` tinyint(1) NULL DEFAULT NULL COMMENT '是否最新',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 15 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '改档记录表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '改档记录表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for exam_question
@@ -73,7 +73,7 @@ CREATE TABLE `exam_question`  (
   `work_id` bigint(20) NOT NULL,
   `is_test` tinyint(4) NOT NULL DEFAULT 0 COMMENT '是否试评,0:不是，1:数据已导入，2:试评中',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 53 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for exam_score_prop
@@ -135,9 +135,11 @@ CREATE TABLE `inspect_task`  (
   `score` int(11) NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE,
   INDEX `FK4e9mfahf522t4ej4y4yd065dh`(`paper_id`) USING BTREE,
+  CONSTRAINT `FK4e9mfahf522t4ej4y4yd065dh` FOREIGN KEY (`paper_id`) REFERENCES `paper` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `inspect_task_ibfk_1` FOREIGN KEY (`paper_id`) REFERENCES `paper` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `inspect_task_ibfk_10` FOREIGN KEY (`paper_id`) REFERENCES `paper` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `inspect_task_ibfk_11` FOREIGN KEY (`paper_id`) REFERENCES `paper` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
+  CONSTRAINT `inspect_task_ibfk_12` FOREIGN KEY (`paper_id`) REFERENCES `paper` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `inspect_task_ibfk_2` FOREIGN KEY (`paper_id`) REFERENCES `paper` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `inspect_task_ibfk_3` FOREIGN KEY (`paper_id`) REFERENCES `paper` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `inspect_task_ibfk_4` FOREIGN KEY (`paper_id`) REFERENCES `paper` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
@@ -167,9 +169,11 @@ CREATE TABLE `level`  (
   `kdpt` int(11) NOT NULL,
   PRIMARY KEY (`id`) USING BTREE,
   UNIQUE INDEX `idx_level_workId_code`(`work_id`, `code`) USING BTREE,
+  CONSTRAINT `FK3km0g7jbkt78oj20csqeh26f2` FOREIGN KEY (`work_id`) REFERENCES `work` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `level_ibfk_1` FOREIGN KEY (`work_id`) REFERENCES `work` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `level_ibfk_10` FOREIGN KEY (`work_id`) REFERENCES `work` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `level_ibfk_11` FOREIGN KEY (`work_id`) REFERENCES `work` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
+  CONSTRAINT `level_ibfk_12` FOREIGN KEY (`work_id`) REFERENCES `work` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `level_ibfk_2` FOREIGN KEY (`work_id`) REFERENCES `work` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `level_ibfk_3` FOREIGN KEY (`work_id`) REFERENCES `work` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `level_ibfk_4` FOREIGN KEY (`work_id`) REFERENCES `work` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
@@ -178,7 +182,7 @@ CREATE TABLE `level`  (
   CONSTRAINT `level_ibfk_7` FOREIGN KEY (`work_id`) REFERENCES `work` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `level_ibfk_8` FOREIGN KEY (`work_id`) REFERENCES `work` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `level_ibfk_9` FOREIGN KEY (`work_id`) REFERENCES `work` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT
-) ENGINE = InnoDB AUTO_INCREMENT = 157 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for mark_log
@@ -206,7 +210,7 @@ CREATE TABLE `mark_log`  (
   PRIMARY KEY (`id`) USING BTREE,
   INDEX `union_001_index`(`create_user_id`, `oper_type`, `subject`, `exam_number`) USING BTREE,
   INDEX `idx_union_2`(`work_id`, `paper_id`, `oper_type`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 696 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '操作日志' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '操作日志' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for mark_subject
@@ -226,9 +230,11 @@ CREATE TABLE `mark_subject`  (
   `enable` tinyint(1) NULL DEFAULT 1 COMMENT '是否启用 0：禁用 1：启用',
   PRIMARY KEY (`id`) USING BTREE,
   INDEX `FK1tvc2mil1ebqgt08912t4hxqw`(`work_id`) USING BTREE,
+  CONSTRAINT `FK1tvc2mil1ebqgt08912t4hxqw` FOREIGN KEY (`work_id`) REFERENCES `work` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `mark_subject_ibfk_1` FOREIGN KEY (`work_id`) REFERENCES `work` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `mark_subject_ibfk_10` FOREIGN KEY (`work_id`) REFERENCES `work` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `mark_subject_ibfk_11` FOREIGN KEY (`work_id`) REFERENCES `work` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
+  CONSTRAINT `mark_subject_ibfk_12` FOREIGN KEY (`work_id`) REFERENCES `work` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `mark_subject_ibfk_2` FOREIGN KEY (`work_id`) REFERENCES `work` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `mark_subject_ibfk_3` FOREIGN KEY (`work_id`) REFERENCES `work` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `mark_subject_ibfk_4` FOREIGN KEY (`work_id`) REFERENCES `work` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
@@ -270,13 +276,16 @@ CREATE TABLE `mark_task`  (
   `display_number` int(11) NULL DEFAULT NULL,
   `manual_score` tinyint(1) NULL DEFAULT NULL COMMENT '是否手工输入打分，1-是、0-否（分档阶段无此值）',
   `is_sample` bit(1) NULL DEFAULT NULL,
+  `deviation_direction` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '偏差方向',
   PRIMARY KEY (`id`) USING BTREE,
   INDEX `idx_mark_task_paper_id`(`paper_id`) USING BTREE,
   INDEX `question_id`(`question_id`, `marker_id`, `stage`, `result`, `is_rejected`, `random_seq`, `random_seq_new`) USING BTREE,
   INDEX `idx_union_1`(`marker_id`, `stage`, `result`, `random_seq`, `random_seq_new`) USING BTREE,
+  CONSTRAINT `FKa6xqlu9ml2e47x1o2u2yec7vm` FOREIGN KEY (`paper_id`) REFERENCES `paper` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `mark_task_ibfk_1` FOREIGN KEY (`paper_id`) REFERENCES `paper` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `mark_task_ibfk_10` FOREIGN KEY (`paper_id`) REFERENCES `paper` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `mark_task_ibfk_11` FOREIGN KEY (`paper_id`) REFERENCES `paper` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
+  CONSTRAINT `mark_task_ibfk_12` FOREIGN KEY (`paper_id`) REFERENCES `paper` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `mark_task_ibfk_2` FOREIGN KEY (`paper_id`) REFERENCES `paper` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `mark_task_ibfk_3` FOREIGN KEY (`paper_id`) REFERENCES `paper` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `mark_task_ibfk_4` FOREIGN KEY (`paper_id`) REFERENCES `paper` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
@@ -285,7 +294,7 @@ CREATE TABLE `mark_task`  (
   CONSTRAINT `mark_task_ibfk_7` FOREIGN KEY (`paper_id`) REFERENCES `paper` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `mark_task_ibfk_8` FOREIGN KEY (`paper_id`) REFERENCES `paper` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `mark_task_ibfk_9` FOREIGN KEY (`paper_id`) REFERENCES `paper` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT
-) ENGINE = InnoDB AUTO_INCREMENT = 213 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for mark_task_job
@@ -299,7 +308,7 @@ CREATE TABLE `mark_task_job`  (
   `work_id` bigint(20) NULL DEFAULT NULL COMMENT '工作区id',
   `version` int(11) NULL DEFAULT 0 COMMENT '版本号',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 94 CHARACTER SET = latin1 COLLATE = latin1_swedish_ci COMMENT = '定时任务调度表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = latin1 COLLATE = latin1_swedish_ci COMMENT = '定时任务调度表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for mark_user
@@ -327,15 +336,18 @@ CREATE TABLE `mark_user`  (
   `one_click_level` bit(1) NULL DEFAULT b'0' COMMENT '科组长是否开启一键定档',
   `standard_volume` bit(1) NOT NULL,
   `level_callback` bit(1) NOT NULL,
+  `leader_confirm` bit(1) NULL DEFAULT b'0' COMMENT '科组长打回、定档是否要确认',
   `display_count` int(1) NULL DEFAULT NULL COMMENT '显示数量：4-4张显示，6-6张显示，8-8张显示',
   `default_account` tinyint(1) NULL DEFAULT NULL COMMENT '是否默认账号（采集账号）',
   `user_type` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '机构管理员类型，1-机构，2-项目经理',
   PRIMARY KEY (`id`) USING BTREE,
   UNIQUE INDEX `UK_cyf7k1neuij8lma85x19omo07`(`login_name`) USING BTREE,
   INDEX `FKinr4i9gbxj9njwo82s7cc89q5`(`group_id`) USING BTREE,
+  CONSTRAINT `FKinr4i9gbxj9njwo82s7cc89q5` FOREIGN KEY (`group_id`) REFERENCES `marker_group` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `mark_user_ibfk_1` FOREIGN KEY (`group_id`) REFERENCES `marker_group` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `mark_user_ibfk_10` FOREIGN KEY (`group_id`) REFERENCES `marker_group` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `mark_user_ibfk_11` FOREIGN KEY (`group_id`) REFERENCES `marker_group` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
+  CONSTRAINT `mark_user_ibfk_12` FOREIGN KEY (`group_id`) REFERENCES `marker_group` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `mark_user_ibfk_2` FOREIGN KEY (`group_id`) REFERENCES `marker_group` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `mark_user_ibfk_3` FOREIGN KEY (`group_id`) REFERENCES `marker_group` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `mark_user_ibfk_4` FOREIGN KEY (`group_id`) REFERENCES `marker_group` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
@@ -344,7 +356,7 @@ CREATE TABLE `mark_user`  (
   CONSTRAINT `mark_user_ibfk_7` FOREIGN KEY (`group_id`) REFERENCES `marker_group` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `mark_user_ibfk_8` FOREIGN KEY (`group_id`) REFERENCES `marker_group` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT,
   CONSTRAINT `mark_user_ibfk_9` FOREIGN KEY (`group_id`) REFERENCES `marker_group` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT
-) ENGINE = InnoDB AUTO_INCREMENT = 193 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for marker_group
@@ -356,7 +368,7 @@ CREATE TABLE `marker_group`  (
   `subject` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
   `work_id` bigint(20) NOT NULL,
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 21 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for organization
@@ -369,7 +381,7 @@ CREATE TABLE `organization`  (
   `enabled` bit(1) NULL DEFAULT NULL COMMENT '是否启用',
   `created_on` date NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 13 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '机构管理' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '机构管理' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for paper
@@ -417,6 +429,7 @@ CREATE TABLE `paper`  (
   `is_shift_score` bit(1) NULL DEFAULT b'0' COMMENT '是否改档打分',
   `is_one_click` bit(1) NULL DEFAULT b'0' COMMENT '是否一键定档',
   `is_rejected_by_leader` bit(1) NULL DEFAULT b'0' COMMENT '是否科组长打回',
+  `is_relate` bit(1) NULL DEFAULT b'0' COMMENT '是否关联试卷',
   PRIMARY KEY (`id`) USING BTREE,
   INDEX `idx_paper_exam_number`(`exam_number`) USING BTREE,
   INDEX `idx_union_1`(`batch_no`) USING BTREE,
@@ -424,7 +437,7 @@ CREATE TABLE `paper`  (
   INDEX `idx_union_3`(`work_id`, `subject`, `batch_no`) USING BTREE,
   INDEX `idx_union_4`(`is_shift`, `is_shift_score`) USING BTREE,
   INDEX `idx_union_5`(`work_id`, `subject`, `score_batch_no`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 472 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for param_setting
@@ -446,9 +459,13 @@ CREATE TABLE `param_setting`  (
   `round_up` tinyint(1) NULL DEFAULT NULL COMMENT '分数处理方式（1：四舍五入、0：非零进一）',
   `change_stage` tinyint(1) NULL DEFAULT NULL COMMENT '改档及改档打分（1：显示、0：不显示）',
   `score_show_all_paper` tinyint(1) NULL DEFAULT NULL COMMENT '打分阶段阅卷员是否显示所有试卷（1：是、0：否）',
+  `prop_denominator` int(2) NULL DEFAULT NULL COMMENT '档位百分比分母（1: \"全部考生数\", 2: \"去掉缺考考生数\"）',
+  `auto_callback_show_deviation` tinyint(1) NULL DEFAULT NULL COMMENT '自动打回时显示偏差',
+  `show_sample` tinyint(1) NULL DEFAULT NULL COMMENT '是否显示标准卷',
+  `direct_score` tinyint(1) NULL DEFAULT NULL COMMENT '是否启用直接输分功能',
   `is_level_to_score` tinyint(1) NULL DEFAULT NULL COMMENT '是否谁分档谁打分',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 41 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '参数设置' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '参数设置' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for shiwai
@@ -482,10 +499,13 @@ CREATE TABLE `student`  (
   `source_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
   `is_test` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '0' COMMENT '是否试评,0:不是，1:数据已导入，2:试评中',
   `relate_exam_number` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '关联考号',
+  `sc_missing` bit(1) NULL DEFAULT b'0' COMMENT '色彩缺考',
+  `sx_missing` bit(1) NULL DEFAULT b'0' COMMENT '速写缺考',
+  `sm_missing` bit(1) NULL DEFAULT b'0' COMMENT '素描缺考',
   PRIMARY KEY (`id`) USING BTREE,
   UNIQUE INDEX `exam_number`(`exam_number`, `work_id`, `is_test`) USING BTREE,
   INDEX `idx_student_name`(`name`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 617 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for task_publish_setting
@@ -506,7 +526,7 @@ CREATE TABLE `task_publish_setting`  (
   `batch_no` bigint(45) NULL DEFAULT NULL,
   `publish_count` int(3) NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 75 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '发布打分任务' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '发布打分任务' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for work
@@ -519,6 +539,6 @@ CREATE TABLE `work`  (
   `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   `organization_id` bigint(20) NULL DEFAULT NULL COMMENT '机构id',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 71 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;

sql/stmms-ms-表创建语句.sql

@@ -1,426 +0,0 @@
--- MySQL dump 10.13  Distrib 5.7.26, for macos10.14 (x86_64)
---
--- Host: localhost    Database: stmms-ms-3
--- ------------------------------------------------------
--- Server version	5.7.17
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Table structure for table `exam_question`
---
-SET NAMES 'utf8';
-DROP TABLE IF EXISTS `exam_question`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `exam_question` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `area_code` varchar(255) CHARACTER SET utf8mb4 NOT NULL,
-  `area_name` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `name` varchar(255) CHARACTER SET utf8mb4 NOT NULL,
-  `subject` varchar(255) CHARACTER SET utf8mb4 NOT NULL,
-  `work_id` bigint(20) NOT NULL,
-  `is_test` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否试评,0:不是，1:数据已导入，2:试评中',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `exam_score_prop`
---
-
-DROP TABLE IF EXISTS `exam_score_prop`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `exam_score_prop` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `subject` varchar(50) DEFAULT NULL COMMENT '科目',
-  `exclude` varchar(100) DEFAULT NULL COMMENT '打分阶段配置过滤档位(可选一个或多个档位，多个档位用","号隔开)',
-  `task_sort` varchar(50) DEFAULT NULL COMMENT '打分阶段配置档位排序规则(可选random/paper，为paper时，score.level.exclude置为空)',
-  `enable` bit(1) DEFAULT b'0' COMMENT '打分阶段配置是否启用(为false则不启用打分阶段分档)，0：不启用，1：启用',
-  `work_id` bigint(20) DEFAULT NULL COMMENT '工作区id',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=37 DEFAULT CHARSET=latin1 COMMENT='考试打分配置';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `inspect_range`
---
-
-DROP TABLE IF EXISTS `inspect_range`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `inspect_range` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `condition` int(11) DEFAULT NULL,
-  `enabled` bit(1) DEFAULT NULL,
-  `student_count` int(11) DEFAULT NULL,
-  `type` varchar(255) DEFAULT NULL,
-  `work_id` bigint(20) DEFAULT NULL,
-  `active` bit(1) NOT NULL,
-  `editable` bit(1) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `inspect_student`
---
-
-DROP TABLE IF EXISTS `inspect_student`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `inspect_student` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `exam_number` varchar(255) NOT NULL,
-  `inspect_range_id` bigint(20) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `inspect_task`
---
-
-DROP TABLE IF EXISTS `inspect_task`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `inspect_task` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `created_on` datetime DEFAULT NULL,
-  `inspect_range_id` bigint(20) NOT NULL,
-  `marker_id` bigint(20) NOT NULL,
-  `marker_name` varchar(255) NOT NULL,
-  `question_id` bigint(20) DEFAULT NULL,
-  `subject` varchar(255) DEFAULT NULL,
-  `updated_on` datetime DEFAULT NULL,
-  `work_id` bigint(20) NOT NULL,
-  `paper_id` bigint(20) NOT NULL,
-  `level` varchar(255) DEFAULT NULL,
-  `score` int(11) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  KEY `FK4e9mfahf522t4ej4y4yd065dh` (`paper_id`),
-  CONSTRAINT `FK4e9mfahf522t4ej4y4yd065dh` FOREIGN KEY (`paper_id`) REFERENCES `paper` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `level`
---
-
-DROP TABLE IF EXISTS `level`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `level` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `code` varchar(50) CHARACTER SET utf8mb4 NOT NULL,
-  `interval_score` int(11) NOT NULL,
-  `level_type` int(11) DEFAULT NULL,
-  `level_value` int(11) NOT NULL,
-  `max_score` int(11) NOT NULL,
-  `min_score` int(11) NOT NULL,
-  `pt` int(11) NOT NULL,
-  `score_list` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `weight` int(11) NOT NULL,
-  `work_id` bigint(20) DEFAULT NULL,
-  `kdpt` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `idx_level_workId_code` (`work_id`,`code`),
-  CONSTRAINT `FK3km0g7jbkt78oj20csqeh26f2` FOREIGN KEY (`work_id`) REFERENCES `work` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `mark_log`
---
-
-DROP TABLE IF EXISTS `mark_log`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `mark_log` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `create_user_id` bigint(20) DEFAULT NULL COMMENT '操作人id',
-  `create_user_name` varchar(100) DEFAULT NULL COMMENT '操作人名字',
-  `create_role` varchar(50) DEFAULT NULL COMMENT '操作人角色',
-  `subject` varchar(50) DEFAULT NULL COMMENT '科目',
-  `exam_number` varchar(255) DEFAULT NULL COMMENT '准考证号',
-  `student_name` varchar(100) DEFAULT NULL COMMENT '学生姓名',
-  `login_time` datetime DEFAULT NULL COMMENT '登录时间（采集专用）',
-  `logout_time` datetime DEFAULT NULL COMMENT '登出时间（采集专用）',
-  `oper_type` int(11) DEFAULT NULL COMMENT '操作类型，1：分档，2：打分，3：回评档位，4：回评分数，5：档位打回，6：档位打回回评，7：一键定档，8：标准卷设置',
-  `oper_data_before` varchar(255) DEFAULT NULL COMMENT '操作前数据',
-  `oper_data_after` varchar(255) DEFAULT NULL COMMENT '操作后数据',
-  `create_time` datetime DEFAULT NULL COMMENT '操作时间',
-  `work_id` bigint(20) DEFAULT NULL COMMENT '考区id',
-  `paper_id` bigint(20) DEFAULT NULL COMMENT '试卷id',
-  `remark` varchar(500) DEFAULT NULL COMMENT '备注',
-  `stage` bigint(20) DEFAULT NULL COMMENT '试卷阶段，0：初始，1：分档，2：打分',
-  `work_name` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  KEY `union_001_index` (`create_user_id`,`oper_type`,`subject`,`exam_number`)
-) ENGINE=InnoDB AUTO_INCREMENT=138 DEFAULT CHARSET=utf8 COMMENT='操作日志';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `mark_subject`
---
-
-DROP TABLE IF EXISTS `mark_subject`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `mark_subject` (
-  `id` varchar(50) CHARACTER SET utf8mb4 NOT NULL,
-  `collect_config` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `name` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `stage` int(11) DEFAULT NULL,
-  `total_score` int(11) NOT NULL,
-  `work_id` bigint(20) DEFAULT NULL,
-  `sample_count` int(11) NOT NULL DEFAULT '100',
-  `is_test` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否试评,0:不是，1:数据已导入，2:试评中',
-  `is_formal` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否正评，0:不是，1:是',
-  `all_level` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否全部根据档位分配完，0:不是，1:是',
-  PRIMARY KEY (`id`),
-  KEY `FK1tvc2mil1ebqgt08912t4hxqw` (`work_id`),
-  CONSTRAINT `FK1tvc2mil1ebqgt08912t4hxqw` FOREIGN KEY (`work_id`) REFERENCES `work` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `mark_task`
---
-
-DROP TABLE IF EXISTS `mark_task`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `mark_task` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `created_on` datetime DEFAULT NULL,
-  `is_rejected` bit(1) NOT NULL,
-  `level_value` int(11) DEFAULT NULL,
-  `marker_id` bigint(20) NOT NULL,
-  `marker_name` varchar(255) CHARACTER SET utf8mb4 NOT NULL,
-  `origin_level` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `question_id` bigint(20) DEFAULT NULL,
-  `result` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `stage` int(11) NOT NULL,
-  `subject` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `updated_on` datetime DEFAULT NULL,
-  `work_id` bigint(20) NOT NULL,
-  `paper_id` bigint(20) NOT NULL,
-  `random_seq` int(11) DEFAULT NULL,
-  `secret_number` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `random_seq_new` bigint(20) DEFAULT NULL COMMENT '随机号',
-  `is_active` bit(1) DEFAULT b'0' COMMENT '是否激活',
-  `is_test` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否试评,0:不是，1:数据已导入，2:试评中',
-  `batch_no` bigint(45) DEFAULT NULL COMMENT '批次号',
-  PRIMARY KEY (`id`),
-  KEY `idx_mark_task_paper_id` (`paper_id`),
-  KEY `question_id` (`question_id`,`marker_id`,`stage`,`result`),
-  CONSTRAINT `FKa6xqlu9ml2e47x1o2u2yec7vm` FOREIGN KEY (`paper_id`) REFERENCES `paper` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=46 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `mark_task_job`
---
-
-DROP TABLE IF EXISTS `mark_task_job`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `mark_task_job` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `data_object` varchar(4000) DEFAULT NULL COMMENT 'object',
-  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-  `status` bit(1) DEFAULT b'0' COMMENT '状态，0：未记录，1：已记录',
-  `work_id` bigint(20) DEFAULT NULL COMMENT '工作区id',
-  `version` int(11) DEFAULT '0' COMMENT '版本号',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=latin1 COMMENT='定时任务调度表';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `mark_user`
---
-
-DROP TABLE IF EXISTS `mark_user`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `mark_user` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `enabled` bit(1) NOT NULL,
-  `last_login_time` datetime DEFAULT NULL,
-  `login_name` varchar(50) CHARACTER SET utf8mb4 NOT NULL,
-  `name` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `password` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `pw_changed_count` int(11) NOT NULL,
-  `session_id` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `group_id` bigint(20) DEFAULT NULL,
-  `mark_right` int(11) DEFAULT NULL,
-  `role` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `subject` varchar(255) CHARACTER SET utf8mb4 NOT NULL,
-  `work_id` bigint(20) NOT NULL,
-  `inspect_sc` bit(1) DEFAULT NULL,
-  `inspect_sm` bit(1) DEFAULT NULL,
-  `inspect_sx` bit(1) DEFAULT NULL,
-  `weight` double DEFAULT NULL,
-  `one_click_level` bit(1) DEFAULT b'0' COMMENT '科组长是否开启一键定档',
-  `standard_volume` bit(1) NOT NULL,
-  `level_callback` bit(1) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `UK_cyf7k1neuij8lma85x19omo07` (`login_name`),
-  KEY `FKinr4i9gbxj9njwo82s7cc89q5` (`group_id`),
-  CONSTRAINT `FKinr4i9gbxj9njwo82s7cc89q5` FOREIGN KEY (`group_id`) REFERENCES `marker_group` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `marker_group`
---
-
-DROP TABLE IF EXISTS `marker_group`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `marker_group` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `name` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `subject` varchar(255) CHARACTER SET utf8mb4 NOT NULL,
-  `work_id` bigint(20) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `paper`
---
-
-DROP TABLE IF EXISTS `paper`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `paper` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `area_code` varchar(50) CHARACTER SET utf8mb4 NOT NULL,
-  `exam_number` varchar(50) CHARACTER SET utf8mb4 NOT NULL,
-  `idx` bigint(20) DEFAULT NULL,
-  `is_arbitrated` bit(1) NOT NULL,
-  `is_manual` bit(1) NOT NULL,
-  `is_rejected` bit(1) NOT NULL,
-  `is_tagged` bit(1) NOT NULL,
-  `level` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `mark_by_leader` bit(1) NOT NULL,
-  `marked_logic` bit(1) NOT NULL,
-  `question_id` bigint(20) NOT NULL,
-  `question_name` varchar(255) CHARACTER SET utf8mb4 NOT NULL,
-  `redo_level` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `score` double DEFAULT NULL,
-  `secret_number` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `student_name` varchar(50) CHARACTER SET utf8mb4 NOT NULL,
-  `subject` varchar(255) CHARACTER SET utf8mb4 NOT NULL,
-  `updated_on` datetime DEFAULT NULL,
-  `uploaded_count` int(11) NOT NULL,
-  `uploaded_on` datetime DEFAULT NULL,
-  `work_id` bigint(20) NOT NULL,
-  `inspect_range` bigint(20) DEFAULT NULL,
-  `inspect_score` double DEFAULT NULL,
-  `source_name` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `inspect_level` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `inspector` bigint(20) DEFAULT NULL,
-  `is_sample` bit(1) NOT NULL,
-  `sheet_md5` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `slice_md5` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `random_seq` bigint(20) DEFAULT NULL COMMENT '随机号',
-  `is_missing` bit(1) NOT NULL,
-  `exam_room` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `is_test` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否试评,0:不是，1:数据已导入，2:试评中',
-  `is_active` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否激活',
-  `batch_no` bigint(45) DEFAULT NULL COMMENT '批次号',
-  PRIMARY KEY (`id`),
-  KEY `idx_paper_index` (`idx`),
-  KEY `idx_paper_exam_number` (`exam_number`),
-  KEY `idx_paper_area_code` (`area_code`),
-  KEY `idx_paper_student_name` (`student_name`),
-  KEY `is_missing` (`is_missing`,`is_test`,`batch_no`)
-) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `shiwai`
---
-
-DROP TABLE IF EXISTS `shiwai`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `shiwai` (
-  `姓名` varchar(255) DEFAULT NULL,
-  `性别` varchar(255) DEFAULT NULL,
-  `地区` varchar(255) DEFAULT NULL,
-  `报名号(按顺序编号)` varchar(255) DEFAULT NULL,
-  `准考证号` varchar(255) DEFAULT NULL,
-  `考场号` varchar(255) DEFAULT NULL,
-  `座位号` varchar(255) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `student`
---
-
-DROP TABLE IF EXISTS `student`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `student` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `area_code` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `area_name` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `exam_number` varchar(50) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `exam_room` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `is_absent` bit(1) NOT NULL,
-  `name` varchar(50) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `upload_status` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `work_id` bigint(20) DEFAULT NULL,
-  `source_name` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `is_test` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '0' COMMENT '是否试评,0:不是，1:数据已导入，2:试评中',
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `exam_number` (`exam_number`,`work_id`,`is_test`),
-  KEY `idx_student_name` (`name`)
-) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `work`
---
-
-DROP TABLE IF EXISTS `work`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `work` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `active` bit(1) NOT NULL,
-  `created_on` date DEFAULT NULL,
-  `name` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=21 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping routines for database 'stmms-ms-3'
---
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2020-01-19 16:21:29

sql/更新脚本.sql

@@ -1,51 +0,0 @@
--- 2019.10.31 by xf
-ALTER TABLE `mark_user`
-ADD COLUMN `standard_volume` BIT(1) NOT NULL default false COMMENT '设置标准卷' AFTER `one_click_level`;
-
-ALTER TABLE `paper`
-ADD COLUMN `exam_room` VARCHAR(255) NULL COMMENT '考点' AFTER `random_seq`;
-
-
--- 2019.11.04 by xf
-ALTER TABLE `mark_log`
-ADD COLUMN `login_time` DATETIME NULL COMMENT '登录时间（采集专用）' AFTER `student_name`,
-ADD COLUMN `logout_time` DATETIME NULL COMMENT '登出时间（采集专用）' AFTER `login_time`;
-
-
-ALTER TABLE `paper`
-ALTER TABLE paper ADD COLUMN `is_test` TINYINT NOT NULL DEFAULT 0 COMMENT '是否试评，1:数据已导入，2:试评中';
-ALTER TABLE paper ADD COLUMN `is_active` BIT(1) NOT NULL DEFAULT false COMMENT '是否激活' AFTER `is_test`;
-ALTER TABLE paper ADD COLUMN `batch_no` bigint(45) COMMENT '批次号' AFTER `is_active`;
-
--- 2019.11.05 by xf
-ALTER TABLE `mark_task`
-ADD COLUMN `is_active` BIT(1) NULL DEFAULT false COMMENT '是否激活' AFTER `random_seq_new`;
-
--- 2019.11.05 by wl
-ALTER TABLE mark_subject ADD ADD `is_test` TINYINT NOT NULL DEFAULT 0 COMMENT '是否试评，1:数据已导入，2:试评中，3:正评中';
-
-ALTER TABLE mark_subject ADD COLUMN `is_formal` BIT(1) NOT NULL DEFAULT 0 COMMENT '是否正评，0:不是，1:是';
-
-ALTER TABLE student ADD COLUMN `is_test` varchar(50) NOT NULL DEFAULT 0 COMMENT '是否试评，1:数据已导入，2:试评中';
-
-ALTER TABLE mark_task ADD COLUMN `is_test` TINYINT NOT NULL DEFAULT 0 COMMENT '是否试评，1:数据已导入，2:试评中';
-
-ALTER TABLE exam_question ADD COLUMN `is_test` TINYINT NOT NULL DEFAULT 0 COMMENT '是否试评，1:数据已导入，2:试评中';
-
-ALTER TABLE paper ADD COLUMN `is_test` TINYINT NOT NULL DEFAULT 0 COMMENT '是否试评，1:数据已导入，2:试评中';
-
-alter table student drop KEY `exam_number`;
-
-alter table student ADD UNIQUE index(`exam_number`,`work_id`,`is_test`);
-
--- 2019.11.08 by wl
-ALTER TABLE `mark_user` ADD COLUMN `level_callback` BIT(1) NOT NULL default false COMMENT '档位打回';
-
--- 2019.11.14 by xf
-ALTER TABLE `mark_log`
-ADD COLUMN `work_name` VARCHAR(255) NULL COMMENT '工作名称' AFTER `work_id`;
-
--- 2019.11.21 by wl
-ALTER TABLE mark_task ADD COLUMN `batch_no` bigint(45) COMMENT '批次号';
-
-ALTER TABLE mark_subject ADD COLUMN `all_level` BIT(1) NOT NULL DEFAULT 0 COMMENT '是否全部根据档位分配完，0:不是，1:是';

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

@@ -1,92 +0,0 @@
-ALTER TABLE `student` ADD COLUMN `school` VARCHAR(255) NULL COMMENT '学校' AFTER `exam_room`;
-ALTER TABLE `student` ADD COLUMN `relate_exam_number` VARCHAR(50) NULL COMMENT '关联考号' AFTER `is_test`;
-
-ALTER TABLE `mark_subject` ADD COLUMN `enable` TINYINT(1) NULL default '1' COMMENT '是否启用 0：禁用 1：启用' AFTER `all_level`;
-
-
-CREATE TABLE `param_setting` (
-  `id` BIGINT(10) NOT NULL AUTO_INCREMENT,
-  `work_id` BIGINT(10) NULL COMMENT '工作id',
-  `package_scan` TINYINT(1) NULL COMMENT '是否整包扫描1：是 0：否',
-  `image_encrypt` TINYINT(1) NULL COMMENT '是否加密1：是 0：否',
-  `name_rule` TINYINT(1) NULL COMMENT '图片命名规则（0：考号命名、1：随机码命名）',
-  `paper_stage` TINYINT(1) NULL COMMENT '试卷档位状态（1：已知、0：未知）',
-  `deviation` int(2) NULL COMMENT '仲裁档位差',
-  `auto_callback` TINYINT(1) NULL COMMENT '是否自动打回（1：是、0：否）',
-  `majority` TINYINT(1) NULL COMMENT '是否过半定档（1：是、0：否）',
-  `cumulative_error` int(3) NULL COMMENT '打回累计误差',
-  `level_show_all_paper` TINYINT(1) NULL COMMENT '分档阶段阅卷员是否显示所有试卷（1：是、0：否）',
-  `round_up` TINYINT(1) NULL COMMENT '分数处理方式（1：四舍五入、0：非零进一）',
-  `change_stage` TINYINT(1) NULL COMMENT '改档及改档打分（1：显示、0：不显示）',
-  `score_show_all_paper` TINYINT(1) NULL COMMENT '打分阶段阅卷员是否显示所有试卷（1：是、0：否）',
-  PRIMARY KEY (`id`))
-COMMENT = '参数设置';
-
-CREATE TABLE `change_level` (
-  `id` BIGINT(20) NOT NULL AUTO_INCREMENT,
-  `work_id` BIGINT(20) NULL,
-  `subject` VARCHAR(50) NULL,
-  `paper_id` BIGINT(20) NULL,
-  `original_level` VARCHAR(45) NULL COMMENT '原档位',
-  `suggest_level` VARCHAR(45) NULL COMMENT '建议档位',
-  `audit_status` INT(1) NULL COMMENT '改档审核：0-申请，1-同意，2-不同意',
-  `create_id` BIGINT(20) NULL COMMENT '申请改档用户id',
-  `create_date` DATETIME NULL COMMENT '申请改档时间',
-  `audit_id` BIGINT(20) NULL COMMENT '审核用户id',
-  `audit_date` DATETIME NULL COMMENT '审核时间',
-  PRIMARY KEY (`id`))
-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 '总数量',
-  `success_count` INT NULL COMMENT '已评数量',
-  `wait_count` VARCHAR(45) NULL COMMENT '待评数量',
-  `sort_rule` TINYINT(1) NULL COMMENT '排序规则：0-乱序，1-定序',
-  `display_number` TINYINT(1) NULL COMMENT '是否显示序号：0-否，1-是',
-  `task_count` INT NULL COMMENT '本次任务数',
-  `batch_no` BIGINT(45) NULL DEFAULT NULL COMMENT '本次任务数',
-  `publish_count` INT NULL COMMENT '发布次数',
-  PRIMARY KEY (`id`))
-COMMENT = '发布打分任务';
-
-ALTER TABLE `mark_user` ADD COLUMN `display_count` INT(1) NULL COMMENT '显示数量：4-四张显示，6-六张显示，8-八张显示' AFTER `level_callback`;
-ALTER TABLE `mark_user` ADD COLUMN `default_account` TINYINT(1) NULL COMMENT '是否默认账号（采集账号）' AFTER `display_count`;
-
-ALTER TABLE `mark_task` ADD COLUMN `serial_number` VARCHAR(10) NULL COMMENT '叫号序号' AFTER `batch_no`;
-ALTER TABLE `mark_task` ADD COLUMN `display_number` TINYINT(1) NULL DEFAULT b'0' COMMENT '是否显示序号：0-否，1-是' AFTER `serial_number`;
-
-ALTER TABLE `paper` ADD COLUMN `score_batch_no` BIGINT(45) NULL DEFAULT NULL COMMENT '打分任务发布批次号' AFTER `batch_no`;
-ALTER TABLE `paper` ADD COLUMN `is_shift` BIT(1) NULL DEFAULT b'0' COMMENT '是否改档' AFTER `score_batch_no`,ADD COLUMN `is_shift_score` BIT(1) NULL DEFAULT b'0' COMMENT '是否改档打分' AFTER `is_shift`;
-ALTER TABLE `paper` ADD COLUMN `is_one_click` BIT(1) NULL DEFAULT b'0' COMMENT '是否一键定档' AFTER `is_shift_score`;
-
-
-INSERT INTO `mark_user` (`id`,`enabled`,`last_login_time`,`login_name`,`name`,`password`,`pw_changed_count`,`session_id`,`group_id`,`mark_right`,`role`,`subject`,`work_id`,`inspect_sc`,`inspect_sm`,`inspect_sx`,`weight`,`one_click_level`,`standard_volume`,`level_callback`,`display_count`,`default_account`) VALUES (50,B'1',NULL,'scan01','scan01','111111',0,NULL,NULL,NULL,'COLLECTOR','SC',0,NULL,NULL,NULL,NULL,B'0',B'0',B'0',NULL,NULL);
-
-
-ALTER TABLE `paper`
-ADD COLUMN `is_rejected_by_leader` BIT(1) NULL DEFAULT b'0' COMMENT '是否科组长打回' AFTER `is_one_click`;
-
-
-CREATE TABLE `attachment` (
-  `id` bigint(64) NOT NULL AUTO_INCREMENT,
-  `work_id` bigint(20) DEFAULT NULL,
-  `subject` varchar(10) DEFAULT NULL,
-  `exam_number` varchar(20) DEFAULT NULL,
-  `file_path_local` varchar(512) NOT NULL,
-  `file_name` varchar(128) NOT NULL,
-  `file_type` varchar(8) DEFAULT NULL,
-  `file_ext` varchar(16) DEFAULT NULL,
-  `bucket` varchar(64) NOT NULL,
-  `object_key` varchar(128) NOT NULL,
-  `oss_name` varchar(500) NOT NULL,
-  `oss_status` varchar(20) NOT NULL,
-  `oss_fail_msg` varchar(500) DEFAULT NULL COMMENT '上传oss失败原因',
-  `delete_status` varchar(20) DEFAULT NULL,
-  `time` datetime NOT NULL,
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=206 DEFAULT CHARSET=utf8;

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

@@ -101,6 +101,12 @@ public class MarkTask implements Serializable {
 
     private String deviationDirection;
 
+    /**
+     * 计算偏差范围使用
+     */
+    @Transient
+    private String dateMineResult;
+
     public Long getBatchNo() {
         return batchNo;
     }
@@ -385,4 +391,12 @@ public class MarkTask implements Serializable {
     public void setDeviationDirection(String deviationDirection) {
         this.deviationDirection = deviationDirection;
     }
+
+    public String getDateMineResult() {
+        return dateMineResult;
+    }
+
+    public void setDateMineResult(String dateMineResult) {
+        this.dateMineResult = dateMineResult;
+    }
 }

stmms-ms-log/src/main/java/cn/com/qmth/stmms/ms/log/aop/MarkLogAop.java

@@ -13,6 +13,7 @@ import cn.com.qmth.stmms.ms.core.domain.user.Role;
 import cn.com.qmth.stmms.ms.core.repository.*;
 import cn.com.qmth.stmms.ms.marking.config.MarkingConfig;
 import cn.com.qmth.stmms.ms.marking.dto.MarkTaskDTO;
+import cn.com.qmth.stmms.ms.marking.service.MarkingService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.lang.StringUtils;
@@ -195,12 +196,14 @@ public class MarkLogAop {
         MarkUser markUser = (MarkUser) map.get(MARK_USER);
         JSONObject aopResult = JSONObject.parseObject(JSONObject.toJSONString(result));
         boolean isRejected = false, oldRejected = false, oldShift = false, oldShiftScore = false;
+        String daterMineResult = null;
         if (Objects.nonNull(aopResult)) {
             MarkTaskDTO resultBody = JSONObject.parseObject(((JSONObject) aopResult.get(BODY)).toJSONString(), MarkTaskDTO.class);
             isRejected = resultBody.isRejected();//新的是否撤档
             oldRejected = resultBody.isOldRejected();//旧的是否撤档
             oldShift = resultBody.isShift();//旧的改档
             oldShiftScore = resultBody.isShiftScore();//旧的改档打分
+            daterMineResult = resultBody.getDateMineResult();
         }
         JSONObject jsonObject = (JSONObject) jsonArgsArray.get(0);
         Paper paper = JSONObject.parseObject(((JSONObject) jsonObject.get(PAPER)).toJSONString(), Paper.class);
@@ -280,7 +283,7 @@ public class MarkLogAop {
                 js.put("deviation", deviation.intValue());
                 MarkTaskJob markTaskJob = new MarkTaskJob(js.toJSONString(), false, paper.getWorkId());
                 markTaskJobRepo.save(markTaskJob);
-                autoCallback(markTasks, deviation.intValue(), paper, markTaskJob, work.getName());
+                autoCallback(markTasks, deviation.intValue(), paper, markTaskJob, work.getName(), daterMineResult);
             }
         }
         //20191107wangliang加入仲裁自动打回算法 end
@@ -295,14 +298,13 @@ public class MarkLogAop {
      * @param markTaskJob
      * @param workName
      */
-    public void autoCallback(List<MarkTask> markTasks, int deviation, Paper paper, MarkTaskJob markTaskJob, String workName) {
+    public void autoCallback(List<MarkTask> markTasks, int deviation, Paper paper, MarkTaskJob markTaskJob, String workName, String daterMineResult) {
         List<MarkTask> result = markTasks.stream().filter(x -> Objects.isNull(x.getResult())).collect(Collectors.toList());
         if (Objects.nonNull(result) && result.size() > 0) {
             LOGGER.info("数据有误，未完成评卷任务");
             markTaskJobRepo.updateMarkTaskJobByVersion(markTaskJob.getId(), markTaskJob.getVersion());
             return;
         }
-        LOGGER.info("paper111:"+ JSONObject.toJSONString(paper));
         List<Level> levels = levelRepo.findByWorkId(paper.getWorkId());
         Map<String, Integer> levelMap = levels.stream().collect(Collectors.toMap(Level::getCode, Level::getLevelValue));
 
@@ -321,7 +323,7 @@ public class MarkLogAop {
                     for (ArbitrateCallback.Distance d : list) {
                         for (MarkTask m : markTasks) {
                             if (Objects.equals(String.valueOf(d.getC()), m.getResult()) && d.getMarkId().longValue() == m.getMarkerId().longValue()) {
-                                m.setDeviationDirection(calcDeviationDirection(levelMap, m.getResult(), m.getLevel()));
+                                m.setDeviationDirection(MarkingService.calcDeviationDirection(levelMap, m.getResult(), daterMineResult));
                                 m.setRejected(true);
                                 m.setOriginLevel(m.getResult());
                                 m.setResult(null);
@@ -340,7 +342,6 @@ public class MarkLogAop {
                     if (count > 0) {
                         markTaskRepo.save(markTasks);
                         paperRepo.save(paper);
-                        LOGGER.info("paper222:"+ JSONObject.toJSONString(paper));
                         markLogRepo.save(markLogList);
                     }
                 }
@@ -350,24 +351,6 @@ public class MarkLogAop {
         LOGGER.info("this:{} markLogAop异步回调结束了", this);
     }
 
-    /**
-     * 计算偏差方向
-     *
-     * @param levelMap
-     * @param result   定档档位
-     * @param level    评卷员打的档位
-     * @return
-     */
-    private String calcDeviationDirection(Map<String, Integer> levelMap, String result, String level) {
-        if (StringUtils.isNotBlank(result) && StringUtils.isNotBlank(level)) {
-            Integer resultInt = levelMap.get(result);
-            Integer levelInt = levelMap.get(level);
-            if (resultInt != null && levelInt != null) {
-                return String.valueOf(levelInt.intValue() - levelInt.intValue());
-            }
-        }
-        return null;
-    }
 
     /**
      * 查询处于哪个档位公用

stmms-ms-main/src/main/java/cn/com/qmth/stmms/ms/quartz/ScheduledTask.java

@@ -132,7 +132,7 @@ public class ScheduledTask implements InitializingBean {
                                 ParamSetting paramSetting = ParamCache.paramMap.get(work.getId());
                                 Integer deviationParam = paramSetting == null ? 3 : paramSetting.getDeviation();
                                 Integer deviation = jsonObject.get("deviation") == null ? deviationParam.intValue() : Integer.parseInt(String.valueOf(jsonObject.get("deviation")));
-                                markLogAop.autoCallback(markTaskList, deviation, paper, m, work.getName());//自动打回记录
+                                markLogAop.autoCallback(markTaskList, deviation, paper, m, work.getName(), null);//自动打回记录
                             }
                         }
                     }

stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/assembler/MarkTaskAssembler.java

@@ -153,6 +153,7 @@ public class MarkTaskAssembler {
             markTaskDTO.setPaperId(paper.getId());
             markTaskDTO.setShift(oldShift);
             markTaskDTO.setShiftScore(oldShiftScore);
+            markTaskDTO.setDateMineResult(markTask.getDateMineResult());
         }
         return markTaskDTO;
     }

stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/dto/MarkTaskDTO.java

@@ -38,6 +38,8 @@ public class MarkTaskDTO implements Serializable{
     private Boolean isRejectedByLeader;
     //打回总次数
     private Integer rejectedCount;
+    // 计算偏差范围使用
+    private String dateMineResult;
     private String deviationDirection;
 
     public Integer getRandomSeq() {
@@ -252,6 +254,14 @@ public class MarkTaskDTO implements Serializable{
         this.loginName = loginName;
     }
 
+    public String getDateMineResult() {
+        return dateMineResult;
+    }
+
+    public void setDateMineResult(String dateMineResult) {
+        this.dateMineResult = dateMineResult;
+    }
+
     public String getDeviationDirection() {
         return deviationDirection;
     }

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

@@ -148,6 +148,9 @@ public class MarkingService {
             //定档
             Integer majority = Optional.ofNullable(ParamCache.paramMap.get(markTask.getWorkId()).getMajority()).orElse(1);
             DeterResult determine = determineLevelService.determine(majority.intValue() == 1 ? true : false, markTasks.toArray(sources));
+            if(Objects.nonNull(determine) && Objects.nonNull(determine.getResult())){
+                markTask.setDateMineResult(determine.getResult());
+            }
             //1.过半定档
             if (Objects.nonNull(determine) && Objects.nonNull(determine.getResult()) && determine.getDeterType() == DetermineLevelService.DeterType.MAJORITY) {
                 paper.determineLevel(determine.getResult());
@@ -318,6 +321,10 @@ public class MarkingService {
         //打回后撤销标准卷
         paper.setSample(false);
         List<MarkTask> markTasks = markTaskRepo.findByPaperIdAndStage(paper.getId(), MarkStage.LEVEL);
+
+        List<Level> levels = levelRepo.findByWorkId(paper.getWorkId());
+        Map<String, Integer> levelMap = levels.stream().collect(Collectors.toMap(Level::getCode, Level::getLevelValue));
+
         List<MarkLog> markLogList = new ArrayList<>();
         for (MarkTask markTask : markTasks) {
             /*if (markTask.getResult() != null && !markTask.getResult().toString().equals(redoLevel)) {
@@ -336,6 +343,7 @@ public class MarkingService {
                         markTask.setOriginLevel(markTask.getResult());
                         markTask.setResult(null);
                         markTask.setLevel(null);
+                        markTask.setDeviationDirection(calcDeviationDirection(levelMap, markTask.getOriginLevel(), redoLevel));
                         MarkLog markLogPrev = markLogRepo.findTopByCreateUserIdAndOperTypeAndSubjectAndExamNumberOrderByCreateTimeDesc(markTask.getMarkerId(), MarkLogOperType.HANDLE_LEVEl.getId(), markTask.getSubject().toString(), paper.getExamNumber());
                         if (Objects.nonNull(markLogPrev)) {
                             operResult = Optional.ofNullable(markLogPrev.getOperDataAfter()).orElse("-");
@@ -448,4 +456,24 @@ public class MarkingService {
             }
         }
     }
+
+
+    /**
+     * 计算偏差方向
+     *
+     * @param levelMap
+     * @param result   定档档位
+     * @param level    评卷员打的档位
+     * @return
+     */
+    public static String calcDeviationDirection(Map<String, Integer> levelMap, String result, String level) {
+        if (Objects.nonNull(result) && Objects.nonNull(level)) {
+            Integer resultInt = levelMap.get(result);
+            Integer levelInt = levelMap.get(level);
+            if (resultInt != null && levelInt != null) {
+                return String.valueOf(levelInt.intValue() - resultInt.intValue());
+            }
+        }
+        return null;
+    }
 }