机构版-3.0.0-bug

sql/msyj-org-v3.0.0-last.sql → sql/msyj-org-v3.0.0.sql

@@ -11,7 +11,7 @@
  Target Server Version : 50717
  File Encoding         : 65001
 
- Date: 12/05/2022 14:07:53
+ Date: 28/06/2022 16:19:04
 */
 
 SET NAMES utf8mb4;
@@ -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 = 3 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 = 85 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 17 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for exam_score_prop
@@ -135,6 +135,7 @@ 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,
@@ -157,6 +158,7 @@ CREATE TABLE `inspect_task`  (
 DROP TABLE IF EXISTS `level`;
 CREATE TABLE `level`  (
   `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `work_id` bigint(20) NULL DEFAULT NULL,
   `code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
   `interval_score` int(11) NOT NULL,
   `level_type` int(11) NULL DEFAULT NULL,
@@ -166,10 +168,10 @@ CREATE TABLE `level`  (
   `pt` int(11) NOT NULL,
   `score_list` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   `weight` int(11) NOT NULL,
-  `work_id` bigint(20) NULL DEFAULT NULL,
   `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,
@@ -184,7 +186,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 = 199 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 89 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for mark_log
@@ -212,7 +214,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 = 15431 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '操作日志' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 605 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '操作日志' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for mark_subject
@@ -220,11 +222,11 @@ CREATE TABLE `mark_log`  (
 DROP TABLE IF EXISTS `mark_subject`;
 CREATE TABLE `mark_subject`  (
   `id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `collect_config` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `work_id` bigint(20) NULL DEFAULT NULL,
   `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `collect_config` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   `stage` int(11) NULL DEFAULT NULL,
   `total_score` int(11) NOT NULL,
-  `work_id` bigint(20) NULL 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:是',
@@ -232,6 +234,7 @@ 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,
@@ -254,7 +257,10 @@ CREATE TABLE `mark_subject`  (
 DROP TABLE IF EXISTS `mark_task`;
 CREATE TABLE `mark_task`  (
   `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `created_on` datetime(0) NULL DEFAULT NULL,
+  `work_id` bigint(20) NOT NULL,
+  `paper_id` bigint(20) NOT NULL,
+  `subject` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `stage` int(11) NOT NULL,
   `is_rejected` bit(1) NOT NULL,
   `level_value` int(11) NULL DEFAULT NULL,
   `marker_id` bigint(20) NOT NULL,
@@ -263,11 +269,6 @@ CREATE TABLE `mark_task`  (
   `question_id` bigint(20) NULL DEFAULT NULL,
   `result` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   `level` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
-  `stage` int(11) NOT NULL,
-  `subject` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `updated_on` datetime(0) NULL DEFAULT NULL,
-  `work_id` bigint(20) NOT NULL,
-  `paper_id` bigint(20) NOT NULL,
   `random_seq` int(11) NULL DEFAULT NULL,
   `secret_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
   `random_seq_new` bigint(20) NULL DEFAULT NULL COMMENT '随机号',
@@ -281,10 +282,13 @@ CREATE TABLE `mark_task`  (
   `is_sample` bit(1) NULL DEFAULT NULL,
   `deviation_direction` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '偏差方向',
   `is_mark` bit(1) NULL DEFAULT b'0' COMMENT '是否标记',
+  `created_on` datetime(0) NULL DEFAULT NULL,
+  `updated_on` datetime(0) NULL DEFAULT NULL,
   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,
@@ -299,7 +303,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 = 4837 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 36245 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for mark_task_job
@@ -313,7 +317,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 = 1348 CHARACTER SET = latin1 COLLATE = latin1_swedish_ci COMMENT = '定时任务调度表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 47 CHARACTER SET = latin1 COLLATE = latin1_swedish_ci COMMENT = '定时任务调度表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for mark_user
@@ -321,19 +325,19 @@ CREATE TABLE `mark_task_job`  (
 DROP TABLE IF EXISTS `mark_user`;
 CREATE TABLE `mark_user`  (
   `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `work_id` bigint(20) NOT NULL,
+  `organization_id` bigint(20) NULL DEFAULT NULL COMMENT '机构id',
+  `subject` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `role` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   `enabled` bit(1) NOT NULL,
   `last_login_time` datetime(0) NULL DEFAULT NULL,
   `login_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   `password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   `pw_changed_count` int(11) NOT NULL,
   `session_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   `group_id` bigint(20) NULL DEFAULT NULL,
   `mark_right` int(11) NULL DEFAULT NULL,
-  `role` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `subject` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `work_id` bigint(20) NOT NULL,
-  `organization_id` bigint(20) NULL DEFAULT NULL COMMENT '机构id',
   `inspect_sc` bit(1) NULL DEFAULT NULL,
   `inspect_sm` bit(1) NULL DEFAULT NULL,
   `inspect_sx` bit(1) NULL DEFAULT NULL,
@@ -348,6 +352,7 @@ CREATE TABLE `mark_user`  (
   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,
@@ -362,7 +367,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 = 272 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 88 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for marker_group
@@ -370,11 +375,11 @@ CREATE TABLE `mark_user`  (
 DROP TABLE IF EXISTS `marker_group`;
 CREATE TABLE `marker_group`  (
   `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `subject` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
   `work_id` bigint(20) NOT NULL,
+  `subject` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 56 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 61 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for organization
@@ -387,7 +392,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 = 3 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '机构管理' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '机构管理' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for paper
@@ -395,27 +400,26 @@ CREATE TABLE `organization`  (
 DROP TABLE IF EXISTS `paper`;
 CREATE TABLE `paper`  (
   `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `area_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `work_id` bigint(20) NOT NULL,
+  `subject` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
   `exam_number` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `student_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `area_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
   `idx` bigint(20) NULL 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 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `redo_level` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `score` double NULL 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 COLLATE utf8mb4_general_ci NOT NULL,
-  `redo_level` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `score` double NULL DEFAULT NULL,
   `secret_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `student_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `subject` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `updated_on` datetime(0) NULL DEFAULT NULL,
   `uploaded_count` int(11) NOT NULL,
   `uploaded_on` datetime(0) NULL DEFAULT NULL,
-  `work_id` bigint(20) NOT NULL,
   `inspect_range` bigint(20) NULL DEFAULT NULL,
   `inspect_score` double NULL DEFAULT NULL,
   `source_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
@@ -439,6 +443,7 @@ CREATE TABLE `paper`  (
   `sort_num` int(11) NULL DEFAULT NULL,
   `scan_user_id` bigint(20) NULL DEFAULT NULL COMMENT '采集员ID',
   `is_mark` bit(1) NULL DEFAULT b'0' COMMENT '是否标记',
+  `updated_on` datetime(0) NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE,
   INDEX `idx_paper_exam_number`(`exam_number`) USING BTREE,
   INDEX `idx_union_1`(`batch_no`) USING BTREE,
@@ -446,7 +451,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 = 1319 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 18819 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for param_setting
@@ -475,7 +480,7 @@ CREATE TABLE `param_setting`  (
   `is_level_to_score` tinyint(1) NULL DEFAULT NULL COMMENT '是否谁分档谁打分',
   `take_best` tinyint(1) NULL DEFAULT NULL COMMENT '取优原则（1：是、0：否）',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 18 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '参数设置' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '参数设置' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for student
@@ -483,15 +488,15 @@ CREATE TABLE `param_setting`  (
 DROP TABLE IF EXISTS `student`;
 CREATE TABLE `student`  (
   `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `work_id` bigint(20) NULL DEFAULT NULL,
+  `exam_number` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   `area_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   `area_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `exam_number` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   `exam_room` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   `school` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '学校',
   `is_absent` bit(1) NOT NULL,
-  `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   `upload_status` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `work_id` bigint(20) NULL DEFAULT NULL,
   `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 '关联考号',
@@ -501,7 +506,7 @@ CREATE TABLE `student`  (
   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 = 1440 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 24017 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for task_publish_setting
@@ -522,7 +527,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 = 379 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '发布打分任务' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 31 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '发布打分任务' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for work
@@ -530,11 +535,11 @@ CREATE TABLE `task_publish_setting`  (
 DROP TABLE IF EXISTS `work`;
 CREATE TABLE `work`  (
   `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `active` bit(1) NOT NULL,
-  `created_on` date NULL DEFAULT NULL,
   `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
   `organization_id` bigint(20) NULL DEFAULT NULL COMMENT '机构id',
+  `active` bit(1) NOT NULL,
+  `created_on` date NULL DEFAULT NULL,
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 18 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 24 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;

stmms-ms-accesscontrol/src/main/java/cn/com/qmth/stmms/ms/accesscontrol/LoginInterceptor.java

@@ -45,7 +45,6 @@ public class LoginInterceptor extends HandlerInterceptorAdapter {
             userId = request.getParameter("userId");
         }
         String token = cacheService.queryTokenCache(userId);
-        logger.info("authorization:{},userId:{},token:{}", authorization, userId, token);
         if (StringUtils.isEmpty(authorization) || StringUtils.isEmpty(userId) || StringUtils.isEmpty(token)) {
             response.sendError(HttpStatus.UNAUTHORIZED.value(), "身份验证失效，请重新登录!");
             return false;

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

@@ -5,7 +5,6 @@ import cn.com.qmth.stmms.ms.core.domain.MarkSubject;
 import cn.com.qmth.stmms.ms.core.domain.Paper;
 import cn.com.qmth.stmms.ms.core.domain.ParamSetting;
 import cn.com.qmth.stmms.ms.core.domain.enums.TrialEnum;
-import cn.com.qmth.stmms.ms.core.domain.task.MarkTask;
 import cn.com.qmth.stmms.ms.core.repository.MarkSubjectRepo;
 import cn.com.qmth.stmms.ms.core.repository.MarkTaskRepo;
 import cn.com.qmth.stmms.ms.core.repository.PaperRepo;
@@ -42,8 +41,7 @@ public class ParamApi {
     /**
      * 查询
      *
-     * @param workId
-     * @return
+     * @param workId 工作ID
      */
     @RequestMapping(value = "/getParam", method = RequestMethod.GET)
     public ParamSetting getOne(@RequestParam Long workId) {
@@ -53,7 +51,7 @@ public class ParamApi {
     /**
      * 更新采集参数
      *
-     * @param workId
+     * @param workId 工作ID
      * @param packageScan
      * @param imageEncrypt
      * @param nameRule
@@ -66,15 +64,12 @@ public class ParamApi {
                                              @RequestParam Integer imageEncrypt,
                                              @RequestParam Integer nameRule,
                                              @RequestParam Integer paperStage) {
-
-
         //保存采集参数
         ParamSetting paramSetting = paramSettingRepo.findByWorkId(workId);
         if (paramSetting == null) {
             paramSetting = ParamSetting.init();
         }
 
-//        List<MarkTask> markTasks = markTaskRepo.findByWorkId(workId);
         int countMarkTasks = markTaskRepo.countByWorkId(workId);
         if (countMarkTasks > 0
                 && !Objects.equals(packageScan, paramSetting.getPackageScan())) {
@@ -83,7 +78,7 @@ public class ParamApi {
 
         //有采集数据，不能修改采集参数
         List<Paper> papers = paperRepo.findByWorkId(workId);
-        if (papers != null && papers.size() > 0) {
+        if (!papers.isEmpty()) {
             if (!Objects.equals(imageEncrypt, paramSetting.getImageEncrypt())
                     || !Objects.equals(nameRule, paramSetting.getNameRule())
                     || !Objects.equals(paperStage, paramSetting.getPaperStage())) {
@@ -91,10 +86,6 @@ public class ParamApi {
             }
         }
 
-//        if(paramSetting.getPaperStage() == 1 && !Objects.equals(paperStage, paramSetting.getPaperStage())){
-//            throw new RuntimeException("试卷档位已经设置，不能修改");
-//        }
-
         paramSetting.setPackageScan(packageScan);
         paramSetting.setImageEncrypt(imageEncrypt);
         paramSetting.setNameRule(nameRule);
@@ -108,13 +99,13 @@ public class ParamApi {
     /**
      * 更新分档规则参数
      *
-     * @param workId 工作ID
-     * @param deviation 仲裁档位差
-     * @param autoCallback 是否自动打回
-     * @param majority 是否过半定档
-     * @param cumulativeError 打回累计误差
+     * @param workId            工作ID
+     * @param deviation         仲裁档位差
+     * @param autoCallback      是否自动打回
+     * @param majority          是否过半定档
+     * @param cumulativeError   打回累计误差
      * @param levelShowAllPaper 分档阶段阅卷员是否显示所有试卷
-     * @param takeBest                  取优原则
+     * @param takeBest          取优原则
      */
     @RequestMapping(value = "/level", method = RequestMethod.POST)
     public ResponseEntity updateLevelParam(@RequestParam Long workId,
@@ -130,10 +121,7 @@ public class ParamApi {
                                            @RequestParam Integer takeBest) {
         List<MarkSubject> markSubjects = markSubjectRepo.findByWorkIdAndTestNotIn(workId, Arrays.asList(TrialEnum.DEFAULT.ordinal(), TrialEnum.START_FORMAL.ordinal()));
         int countMarkTasks = markTaskRepo.countByWorkId(workId);
-        boolean flag = false;
-        if ((markSubjects == null || markSubjects.size() == 0) && countMarkTasks > 0) {
-            flag = true;
-        }
+        boolean flag = markSubjects.isEmpty() && countMarkTasks > 0;
 
         //保存分档参数
         ParamSetting paramSetting = paramSettingRepo.findByWorkId(workId);
@@ -176,12 +164,8 @@ public class ParamApi {
         Integer isLevelToScore = (Integer) map.get("isLevelToScore");
         Integer directScore = (Integer) map.get("directScore");
         List<MarkSubject> markSubjects = markSubjectRepo.findByWorkIdAndTestNotIn(workId, Arrays.asList(TrialEnum.DEFAULT.ordinal(), TrialEnum.START_FORMAL.ordinal()));
-//        List<MarkTask> markTasks = markTaskRepo.findByWorkId(workId);
         int countMarkTasks = markTaskRepo.countByWorkId(workId);
-        boolean flag = false;
-        if ((markSubjects == null || markSubjects.size() == 0) && countMarkTasks > 0) {
-            flag = true;
-        }
+        boolean flag = markSubjects.isEmpty() && countMarkTasks > 0;
 
         //保存打分参数
         ParamSetting paramSetting = paramSettingRepo.findByWorkId(workId);

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

@@ -15,7 +15,6 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.HashSet;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -50,30 +49,36 @@ public class ImageApi {
 
     private ExecutorService executor = Executors.newFixedThreadPool(1);
 
-    private HashSet<String> papers = new HashSet<String>();
-
     LinkedBlockingQueue<RotateTask> queue = new LinkedBlockingQueue<>();
 
+    /**
+     * 旋转图片异步方法
+     *
+     * @param paperId 试卷ID
+     * @param degree  旋转角度
+     */
     @RequestMapping(value = "{paperId}/rotate", method = RequestMethod.GET)
     public ResponseEntity rotate(@PathVariable Long paperId, @RequestParam int degree) {
         Paper paper = paperRepo.findOne(paperId);
-//        if (!papers.contains(paper.getExamNumber())) {
-//            executor.submit(new RotateTask(paper, degree, paperRepo, systemConfig, papers, imageConfig, studentRepo, ossUtil, aliYunOssConfig, imageServerConfig));
-//            papers.add(paper.getExamNumber());
-//        }
-        RotateTask rotateTask = new RotateTask(paper, degree, paperRepo, systemConfig, papers, imageConfig, studentRepo, ossUtil, aliYunOssConfig, imageServerConfig);
+        RotateTask rotateTask = new RotateTask(paper, degree, paperRepo, systemConfig, imageConfig, studentRepo, ossUtil, aliYunOssConfig, imageServerConfig);
         queue.offer(rotateTask);
-        while (queue.size() > 0) {
+        while (!queue.isEmpty()) {
             synchronized (this) {
-                executor.submit(queue.poll());
+                RotateTask poll = queue.poll();
+                if (poll != null) {
+                    executor.submit(poll);
+                }
             }
         }
         return new ResponseEntity(HttpStatus.OK);
     }
 
+    /**
+     * 旋转进度
+     */
     @RequestMapping(value = "process", method = RequestMethod.GET)
     public ResponseEntity process() {
-        return new ResponseEntity(papers.size(), HttpStatus.OK);
+        return new ResponseEntity(queue.size(), HttpStatus.OK);
     }
 
 }

stmms-ms-collect/src/main/java/cn/com/qmth/stmms/ms/collect/util/RotateTask.java

@@ -18,7 +18,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.util.FileCopyUtils;
 
 import java.io.*;
-import java.util.HashSet;
 import java.util.StringJoiner;
 
 public class RotateTask implements Runnable {
@@ -29,17 +28,15 @@ public class RotateTask implements Runnable {
     private int degree;
     private PaperRepo paperRepo;
     private SystemConfig systemConfig;
-    private HashSet<String> papers;
     private OssUtil ossUtil;
     private AliYunOssConfig aliYunOssConfig;
     private ImageServerConfig imageServerConfig;
 
-    public RotateTask(Paper paper, int degree, PaperRepo paperRepo, SystemConfig systemConfig, HashSet<String> papers, ImageConfig imageConfig, StudentRepo studentRepo, OssUtil ossUtil, AliYunOssConfig aliYunOssConfig, ImageServerConfig imageServerConfig) {
+    public RotateTask(Paper paper, int degree, PaperRepo paperRepo, SystemConfig systemConfig, ImageConfig imageConfig, StudentRepo studentRepo, OssUtil ossUtil, AliYunOssConfig aliYunOssConfig, ImageServerConfig imageServerConfig) {
         this.paper = paper;
         this.degree = degree;
         this.paperRepo = paperRepo;
         this.systemConfig = systemConfig;
-        this.papers = papers;
         this.imageConfig = imageConfig;
         this.studentRepo = studentRepo;
         this.ossUtil = ossUtil;
@@ -318,7 +315,6 @@ public class RotateTask implements Runnable {
         } catch (Exception e) {
             e.printStackTrace();
         } finally {
-            papers.remove(paper.getExamNumber());
         }
     }
 }

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

@@ -132,7 +132,6 @@ public class MarkLogAop {
         Map<String, Object> map = getAspectCommon(joinPoint);
         JSONArray jsonArgsArray = (JSONArray) map.get(PARAM_ARGS);
         MarkUser markUser = (MarkUser) map.get(MARK_USER);
-//        Paper paper = JSONObject.parseObject(((JSONObject) jsonArgsArray.get(0)).toJSONString(), Paper.class);
         JSONObject jsonObjectResult = (JSONObject) jsonArgsArray.get(0);
         String paperIds = (String) jsonObjectResult.get("paperIds");
         if (paperIds.length() > 0) {

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

@@ -558,7 +558,7 @@ public class MarkTaskApi {
             //数量
             long count = papers.stream().filter(m -> Objects.nonNull(m.getLevel()) && Objects.equals(level.getCode(), m.getLevel())).count();
             levelDetailDTO.setLevelCount((int) count);
-            BigDecimal prop = papers.size() == 0 ? new BigDecimal("0") : new BigDecimal(String.valueOf(count * 100)).divide(new BigDecimal(String.valueOf(papers.size())), 2, BigDecimal.ROUND_HALF_UP);
+            BigDecimal prop = papers.isEmpty() ? new BigDecimal("0") : new BigDecimal(String.valueOf(count * 100)).divide(new BigDecimal(String.valueOf(papers.size())), 2, BigDecimal.ROUND_HALF_UP);
             //占比
             levelDetailDTO.setLevelProp(prop.doubleValue());
             //预设占比
@@ -570,7 +570,7 @@ public class MarkTaskApi {
             int sumCount = (int) (list.stream().mapToInt(LevelDetailDTO::getLevelCount).sum() + count);
             levelDetailDTO.setCumulateCount(sumCount);
             //累计占比
-            BigDecimal cumulateProp = papers.size() == 0 ? new BigDecimal("0") : new BigDecimal(String.valueOf(sumCount * 100)).divide(new BigDecimal(String.valueOf(papers.size())), 2, BigDecimal.ROUND_HALF_UP);
+            BigDecimal cumulateProp = papers.isEmpty() ? new BigDecimal("0") : new BigDecimal(String.valueOf(sumCount * 100)).divide(new BigDecimal(String.valueOf(papers.size())), 2, BigDecimal.ROUND_HALF_UP);
             levelDetailDTO.setCumulateProp(cumulateProp.doubleValue());
 
             //调整
@@ -611,13 +611,6 @@ public class MarkTaskApi {
                                     @RequestParam MarkStage stage,
                                     @RequestParam Long markerId,
                                     Pageable pageable) {
-        /*List<MarkTask> markTasks = markTaskRepo.findByWorkIdAndSubjectAndStageAndMarkerIdAndIsMarkTrue(workId, subject, stage, markerId);
-        List<MarkTaskDTO> markTaskDTOs = new ArrayList<>();
-        markTasks.forEach(m -> {
-            markTaskDTOs.add(markTaskAssembler.toDTO(m));
-        });
-        return markTaskDTOs;*/
-
         List<MarkTaskDTO> markTaskDTOs = new ArrayList<>();
         Specification<MarkTask> specification = (root, query, builder) -> {
             List<Predicate> predicates = new ArrayList<>();

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

@@ -348,8 +348,7 @@ public class MarkingService {
                 String operResult = "-";
                 Date date = new Date();
                 for (String r : range) {
-                    // 建议的档位与其中评委所评档位相同时就不打回给此评委
-                    if (Objects.equals(String.valueOf(markTask.getMarkerId()), r) && !redoLevel.equals(markTask.getResult())) {
+                    if (Objects.equals(String.valueOf(markTask.getMarkerId()), r)) {
                         markTask.setRejected(true);
                         markTask.setOriginLevel(markTask.getResult());
                         markTask.setResult(null);