fix

install/mysql/upgrade/1.3.15.sql

@@ -2,119 +2,24 @@
 
 USE `stmms_ft`;
 
-ALTER TABLE stmms_ft.m_reject_history ADD INDEX index2(`library_id`);
-ALTER TABLE stmms_ft.eb_inspect_history MODIFY column inspector_id INT (11) NOT NULL COMMENT '复核人ID';
-ALTER TABLE stmms_ft.eb_inspect_history MODIFY column  student_id INT (11) NOT NULL COMMENT '考生ID';
-ALTER TABLE stmms_ft.eb_selective_group MODIFY column score_policy	varchar(64) NOT NULL COMMENT '合分方式';
-ALTER TABLE stmms_ft.eb_selective_student ADD COLUMN `not_selective`	tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否未选做';
+ALTER TABLE m_reject_history ADD INDEX index2(`library_id`);
+ALTER TABLE eb_inspect_history MODIFY column inspector_id INT (11) NOT NULL COMMENT '复核人ID';
+ALTER TABLE eb_inspect_history MODIFY column  student_id INT (11) NOT NULL COMMENT '考生ID';
+ALTER TABLE eb_selective_group MODIFY column score_policy	varchar(64) NOT NULL COMMENT '合分方式';
+ALTER TABLE eb_selective_student ADD COLUMN `not_selective`	tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否未选做';
 -- 更新选做题未选做数据
-update stmms_ft.eb_selective_student set not_selective=1 where student_id
+update eb_selective_student set not_selective=1 where student_id 
 in(
-	select tem.student_id from
+	select tem.student_id from 
 	(
-		select
+		select 
 		e.student_id,
 		sg.selective_index,
 		sum(case when e.group_score != -1 then 1 else 0 end) cc
-		from stmms_ft.eb_subjective_score e
-		left join stmms_ft.eb_mark_group mg on e.exam_id=mg.exam_id and e.subject_code=mg.subject_code and e.group_number=mg.number
-		left join stmms_ft.eb_selective_group sg on sg.exam_id=e.exam_id and sg.subject_code=e.subject_code and sg.main_number=e.main_number
+		from eb_subjective_score e 
+		left join eb_mark_group mg on e.exam_id=mg.exam_id and e.subject_code=mg.subject_code and e.group_number=mg.number
+		left join eb_selective_group sg on sg.exam_id=e.exam_id and sg.subject_code=e.subject_code and sg.main_number=e.main_number 
 		where mg.is_selective=1
 		GROUP BY e.student_id,sg.selective_index
 	)tem where tem.cc=0
-);
-
-USE college_scan_multi;
-
-ALTER TABLE college_scan_multi.`baseinfo` ADD COLUMN `isOnLine`  smallint(1) NULL DEFAULT NULL AFTER `conver`;
-ALTER TABLE college_scan_multi.`check_omr` DROP INDEX `mark_dth`;
-ALTER TABLE college_scan_multi.`check_omr` ADD COLUMN `mark_xth`  longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `check_ip`;
-ALTER TABLE college_scan_multi.`check_omr` ADD COLUMN `admin_mark_xth`  longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `admin_check_status`;
-ALTER TABLE college_scan_multi.`check_omr` ADD COLUMN `check_history1`  varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL AFTER `admin_mark_xth`;
-ALTER TABLE college_scan_multi.`check_omr` ADD COLUMN `admin_mark_xth_history`  longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `check_history1`;
-ALTER TABLE college_scan_multi.`check_omr` DROP COLUMN `mark_dth`;
-CREATE INDEX `mark_xth` ON college_scan_multi.`check_omr`(`mark_xth`(768)) USING BTREE ;
-ALTER TABLE college_scan_multi.`ocrdata` ADD COLUMN `is_kgt_km`  int(1) NULL DEFAULT NULL AFTER `SubjectName`;
-ALTER TABLE college_scan_multi.`ocrdata` ADD COLUMN `omr_repeat`  bit(1) NULL DEFAULT NULL AFTER `OCRUser`;
-ALTER TABLE college_scan_multi.`ocrdata` MODIFY COLUMN `isUpload_kgt`  int(1) NULL DEFAULT NULL AFTER `isUpload`;
-ALTER TABLE college_scan_multi.`ocrdata` DROP COLUMN `slicePic`;
-ALTER TABLE college_scan_multi.`task_child` MODIFY COLUMN `check_times1`  varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL AFTER `task_id`;
-ALTER TABLE college_scan_multi.`task_child` ADD COLUMN `check_user`  varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL AFTER `check_status1`;
-CREATE INDEX `exam_id` ON college_scan_multi.`task_child`(`exam_id`) USING BTREE ;
-CREATE INDEX `exam_number` ON college_scan_multi.`task_child`(`exam_number`) USING BTREE ;
-CREATE INDEX `task_id` ON college_scan_multi.`task_child`(`task_id`) USING BTREE ;
-ALTER TABLE college_scan_multi.`task_master` ADD COLUMN `task_class`  varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL AFTER `task_id`;
-ALTER TABLE college_scan_multi.`task_master` ADD COLUMN `task_xh`  int(3) NULL DEFAULT NULL AFTER `task_type`;
-ALTER TABLE college_scan_multi.`task_master` ADD COLUMN `task_ui_where`  longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `task_where`;
-CREATE INDEX `task_id` ON college_scan_multi.`task_master`(`task_id`) USING BTREE ;
-CREATE INDEX `task_class` ON college_scan_multi.`task_master`(`task_class`) USING BTREE ;
-CREATE INDEX `task_xh` ON college_scan_multi.`task_master`(`task_xh`) USING BTREE ;
-ALTER TABLE college_scan_multi.`upload_file_list` ADD COLUMN `json_card`  longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `DiskSerNo`;
-
-DROP TABLE IF EXISTS college_scan_multi.`ocrdata_objective`;
-CREATE TABLE college_scan_multi.`ocrdata_objective` (
-                                                        `exam_id` int(5) NOT NULL,
-                                                        `exam_number` varchar(30) NOT NULL,
-                                                        `is_merge` bit(1) DEFAULT NULL,
-                                                        `subjective_DiskSerNo` varchar(50) DEFAULT NULL,
-                                                        `subjective_sheet_count` int(3) DEFAULT NULL,
-                                                        `subjective_sheet_src` longtext,
-                                                        `subjective_slice_count` int(3) DEFAULT NULL,
-                                                        `subjective_slice_src` longtext,
-                                                        `subjective_scan_page_list` varchar(100) DEFAULT NULL,
-                                                        `subjective_slice_point` longtext,
-                                                        `subjective_is_upload` bit(1) DEFAULT NULL,
-                                                        `objective_DiskSerNo` varchar(50) DEFAULT NULL,
-                                                        `objective_sheet_count` int(3) DEFAULT NULL,
-                                                        `objective_sheet_src` longtext,
-                                                        `objective_slice_count` int(3) DEFAULT NULL,
-                                                        `objective_slice_src` longtext,
-                                                        `objective_scan_page_list` varchar(100) DEFAULT NULL,
-                                                        `objective_slice_point` longtext,
-                                                        `objective_kgt_point` longtext,
-                                                        `objective_is_upload` bit(1) DEFAULT NULL,
-                                                        `objective_absent` bit(1) DEFAULT NULL,
-                                                        `objective_wj` bit(1) DEFAULT NULL,
-                                                        `objective_paper_type` varchar(5) DEFAULT NULL,
-                                                        `objective_firstResult` longtext,
-                                                        `objective_secondResult` longtext,
-                                                        PRIMARY KEY (`exam_id`,`exam_number`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
-
-DROP TABLE IF EXISTS college_scan_multi.`omr_picture_data`;
-CREATE TABLE college_scan_multi.`omr_picture_data` (
-                                                       `exam_id` int(5) NOT NULL,
-                                                       `exam_number` varchar(30) NOT NULL,
-                                                       `subject_code` varchar(30) DEFAULT NULL,
-                                                       `yccl` int(3) DEFAULT NULL,
-                                                       `first_result` longtext,
-                                                       `second_result` longtext,
-                                                       `kgt_point` longtext,
-                                                       `is_upload` bit(1) DEFAULT NULL,
-                                                       PRIMARY KEY (`exam_id`,`exam_number`) USING BTREE,
-                                                       KEY `exam_id` (`exam_id`) USING BTREE,
-                                                       KEY `exam_number` (`exam_number`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
-
-DROP TABLE IF EXISTS college_scan_multi.`task_ans_check_child`;
-CREATE TABLE college_scan_multi.`task_ans_check_child` (
-                                                           `exam_id` int(11) NOT NULL,
-                                                           `exam_number` varchar(30) NOT NULL,
-                                                           `task_type` int(3) DEFAULT NULL,
-                                                           `task_id` varchar(30) NOT NULL,
-                                                           `task_xh` int(3) NOT NULL,
-                                                           `omrResult` longtext,
-                                                           `check_times1` varchar(30) DEFAULT NULL,
-                                                           `check_ip1` varchar(30) DEFAULT NULL,
-                                                           `check_status1` varchar(30) DEFAULT NULL,
-                                                           `check_user` varchar(30) DEFAULT NULL,
-                                                           PRIMARY KEY (`exam_id`,`exam_number`,`task_id`) USING BTREE,
-                                                           KEY `exam_number` (`exam_number`) USING BTREE,
-                                                           KEY `task_type` (`task_type`) USING BTREE,
-                                                           KEY `task_id` (`task_id`) USING BTREE,
-                                                           KEY `task_xh` (`task_xh`) USING BTREE,
-                                                           KEY `check_ip1` (`check_ip1`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
-
-
-
+);

install/mysql/upgrade/1.5.0.sql

@@ -1,17 +1,17 @@
 -- 1.5.0
 USE `stmms_ft`;
-INSERT INTO stmms_ft.`b_sys_config` (`id`, `type`, `description`, `update_time`)
+INSERT INTO `b_sys_config` (`id`, `type`, `description`, `update_time`)
 VALUES (4, 'STUDENT_SHEET_COUNT', null, '2021-08-09 15:38:58');
 
-ALTER TABLE stmms_ft.eb_mark_group ADD COLUMN `arbitrate_type`      varchar(16)  DEFAULT NULL COMMENT '仲裁方式';
-ALTER TABLE stmms_ft.eb_exam_question ADD COLUMN `arbitrate_threshold` double    DEFAULT NULL COMMENT '仲裁阈值';
-ALTER TABLE stmms_ft.m_arbitrate_history ADD COLUMN `question_index` text        DEFAULT NULL COMMENT '题目序号';
+ALTER TABLE eb_mark_group ADD COLUMN `arbitrate_type`      varchar(16)  DEFAULT NULL COMMENT '仲裁方式';
+ALTER TABLE eb_exam_question ADD COLUMN `arbitrate_threshold` double    DEFAULT NULL COMMENT '仲裁阈值';
+ALTER TABLE m_arbitrate_history ADD COLUMN `question_index` text        DEFAULT NULL COMMENT '题目序号';
 
-update stmms_ft.eb_mark_group set arbitrate_type='GROUP' where double_rate is not null and double_rate>0;
-ALTER TABLE  stmms_ft.eb_exam_subject MODIFY COLUMN `inspect_round` 	INT (11) NOT NULL DEFAULT 1 COMMENT '复核轮数';
+update eb_mark_group set arbitrate_type='GROUP' where double_rate is not null and double_rate>0;
+ALTER TABLE  eb_exam_subject MODIFY COLUMN `inspect_round` 	INT (11) NOT NULL DEFAULT 1 COMMENT '复核轮数';
 
-DROP TABLE IF EXISTS stmms_ft.`s_basic_subject_range`;
-CREATE TABLE stmms_ft.`s_basic_subject_range`
+DROP TABLE IF EXISTS `s_basic_subject_range`;
+CREATE TABLE `s_basic_subject_range`
 (
     `id`                   int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
     `exam_id`              int(11)     DEFAULT NULL COMMENT '考试ID',
@@ -25,99 +25,3 @@ CREATE TABLE stmms_ft.`s_basic_subject_range`
     KEY `index1` (`exam_id`, `subject_code`)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4 COMMENT ='科目客观题分段统计表';
-
-
-USE college_scan_multi;
-
-ALTER TABLE college_scan_multi.`baseinfo` ADD COLUMN `isOnLine`  smallint(1) NULL DEFAULT NULL AFTER `conver`;
-ALTER TABLE college_scan_multi.`check_omr` DROP INDEX `mark_dth`;
-ALTER TABLE college_scan_multi.`check_omr` ADD COLUMN `mark_xth`  longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `check_ip`;
-ALTER TABLE college_scan_multi.`check_omr` ADD COLUMN `admin_mark_xth`  longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `admin_check_status`;
-ALTER TABLE college_scan_multi.`check_omr` ADD COLUMN `check_history1`  varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL AFTER `admin_mark_xth`;
-ALTER TABLE college_scan_multi.`check_omr` ADD COLUMN `admin_mark_xth_history`  longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `check_history1`;
-ALTER TABLE college_scan_multi.`check_omr` DROP COLUMN `mark_dth`;
-CREATE INDEX `mark_xth` ON college_scan_multi.`check_omr`(`mark_xth`(768)) USING BTREE ;
-ALTER TABLE college_scan_multi.`ocrdata` ADD COLUMN `is_kgt_km`  int(1) NULL DEFAULT NULL AFTER `SubjectName`;
-ALTER TABLE college_scan_multi.`ocrdata` ADD COLUMN `omr_repeat`  bit(1) NULL DEFAULT NULL AFTER `OCRUser`;
-ALTER TABLE college_scan_multi.`ocrdata` MODIFY COLUMN `isUpload_kgt`  int(1) NULL DEFAULT NULL AFTER `isUpload`;
-ALTER TABLE college_scan_multi.`ocrdata` DROP COLUMN `slicePic`;
-ALTER TABLE college_scan_multi.`task_child` MODIFY COLUMN `check_times1`  varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL AFTER `task_id`;
-ALTER TABLE college_scan_multi.`task_child` ADD COLUMN `check_user`  varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL AFTER `check_status1`;
-CREATE INDEX `exam_id` ON college_scan_multi.`task_child`(`exam_id`) USING BTREE ;
-CREATE INDEX `exam_number` ON college_scan_multi.`task_child`(`exam_number`) USING BTREE ;
-CREATE INDEX `task_id` ON college_scan_multi.`task_child`(`task_id`) USING BTREE ;
-ALTER TABLE college_scan_multi.`task_master` ADD COLUMN `task_class`  varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL AFTER `task_id`;
-ALTER TABLE college_scan_multi.`task_master` ADD COLUMN `task_xh`  int(3) NULL DEFAULT NULL AFTER `task_type`;
-ALTER TABLE college_scan_multi.`task_master` ADD COLUMN `task_ui_where`  longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `task_where`;
-CREATE INDEX `task_id` ON college_scan_multi.`task_master`(`task_id`) USING BTREE ;
-CREATE INDEX `task_class` ON college_scan_multi.`task_master`(`task_class`) USING BTREE ;
-CREATE INDEX `task_xh` ON college_scan_multi.`task_master`(`task_xh`) USING BTREE ;
-ALTER TABLE college_scan_multi.`upload_file_list` ADD COLUMN `json_card`  longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `DiskSerNo`;
-
-DROP TABLE IF EXISTS college_scan_multi.`ocrdata_objective`;
-CREATE TABLE college_scan_multi.`ocrdata_objective` (
-                                                        `exam_id` int(5) NOT NULL,
-                                                        `exam_number` varchar(30) NOT NULL,
-                                                        `is_merge` bit(1) DEFAULT NULL,
-                                                        `subjective_DiskSerNo` varchar(50) DEFAULT NULL,
-                                                        `subjective_sheet_count` int(3) DEFAULT NULL,
-                                                        `subjective_sheet_src` longtext,
-                                                        `subjective_slice_count` int(3) DEFAULT NULL,
-                                                        `subjective_slice_src` longtext,
-                                                        `subjective_scan_page_list` varchar(100) DEFAULT NULL,
-                                                        `subjective_slice_point` longtext,
-                                                        `subjective_is_upload` bit(1) DEFAULT NULL,
-                                                        `objective_DiskSerNo` varchar(50) DEFAULT NULL,
-                                                        `objective_sheet_count` int(3) DEFAULT NULL,
-                                                        `objective_sheet_src` longtext,
-                                                        `objective_slice_count` int(3) DEFAULT NULL,
-                                                        `objective_slice_src` longtext,
-                                                        `objective_scan_page_list` varchar(100) DEFAULT NULL,
-                                                        `objective_slice_point` longtext,
-                                                        `objective_kgt_point` longtext,
-                                                        `objective_is_upload` bit(1) DEFAULT NULL,
-                                                        `objective_absent` bit(1) DEFAULT NULL,
-                                                        `objective_wj` bit(1) DEFAULT NULL,
-                                                        `objective_paper_type` varchar(5) DEFAULT NULL,
-                                                        `objective_firstResult` longtext,
-                                                        `objective_secondResult` longtext,
-                                                        PRIMARY KEY (`exam_id`,`exam_number`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
-
-DROP TABLE IF EXISTS college_scan_multi.`omr_picture_data`;
-CREATE TABLE college_scan_multi.`omr_picture_data` (
-                                                       `exam_id` int(5) NOT NULL,
-                                                       `exam_number` varchar(30) NOT NULL,
-                                                       `subject_code` varchar(30) DEFAULT NULL,
-                                                       `yccl` int(3) DEFAULT NULL,
-                                                       `first_result` longtext,
-                                                       `second_result` longtext,
-                                                       `kgt_point` longtext,
-                                                       `is_upload` bit(1) DEFAULT NULL,
-                                                       PRIMARY KEY (`exam_id`,`exam_number`) USING BTREE,
-                                                       KEY `exam_id` (`exam_id`) USING BTREE,
-                                                       KEY `exam_number` (`exam_number`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
-
-DROP TABLE IF EXISTS college_scan_multi.`task_ans_check_child`;
-CREATE TABLE college_scan_multi.`task_ans_check_child` (
-                                                           `exam_id` int(11) NOT NULL,
-                                                           `exam_number` varchar(30) NOT NULL,
-                                                           `task_type` int(3) DEFAULT NULL,
-                                                           `task_id` varchar(30) NOT NULL,
-                                                           `task_xh` int(3) NOT NULL,
-                                                           `omrResult` longtext,
-                                                           `check_times1` varchar(30) DEFAULT NULL,
-                                                           `check_ip1` varchar(30) DEFAULT NULL,
-                                                           `check_status1` varchar(30) DEFAULT NULL,
-                                                           `check_user` varchar(30) DEFAULT NULL,
-                                                           PRIMARY KEY (`exam_id`,`exam_number`,`task_id`) USING BTREE,
-                                                           KEY `exam_number` (`exam_number`) USING BTREE,
-                                                           KEY `task_type` (`task_type`) USING BTREE,
-                                                           KEY `task_id` (`task_id`) USING BTREE,
-                                                           KEY `task_xh` (`task_xh`) USING BTREE,
-                                                           KEY `check_ip1` (`check_ip1`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
-
-
-