浏览代码

更新扫描端脚本

yin 9 月之前
父节点
当前提交
3712067e28
共有 4 个文件被更改,包括 884 次插入479 次删除
  1. 538 420
      install/mysql/init/college_scan_multi.sql
  2. 107 12
      install/mysql/upgrade/1.3.15.sql
  3. 104 8
      install/mysql/upgrade/1.5.0.sql
  4. 135 39
      install/mysql/upgrade/1.5.1.sql

+ 538 - 420
install/mysql/init/college_scan_multi.sql

@@ -6,545 +6,663 @@ SET FOREIGN_KEY_CHECKS=0;
 -- Table structure for absent
 -- ----------------------------
 DROP TABLE IF EXISTS `absent`;
-CREATE TABLE `absent` (
-  `exam_id` int(11) NOT NULL,
-  `examNumber` varchar(30) NOT NULL,
-  `campus_name` varchar(50) DEFAULT NULL,
-  `packageCode` varchar(30) DEFAULT NULL,
-  `studentCode` varchar(30) DEFAULT NULL,
-  `name` varchar(50) DEFAULT NULL,
-  `subjectCode` varchar(30) DEFAULT NULL,
-  `subjectName` varchar(50) DEFAULT NULL,
-  `seatNo` varchar(30) DEFAULT NULL,
-  `statues` varchar(30) DEFAULT NULL,
-  PRIMARY KEY (`examNumber`,`exam_id`),
-  KEY `PackageCode` (`packageCode`),
-  KEY `SubjectCode` (`subjectCode`),
-  KEY `Name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+CREATE TABLE `absent`
+(
+    `exam_id`     int(11) NOT NULL,
+    `examNumber`  varchar(30) NOT NULL,
+    `campus_name` varchar(50) DEFAULT NULL,
+    `packageCode` varchar(30) DEFAULT NULL,
+    `studentCode` varchar(30) DEFAULT NULL,
+    `name`        varchar(50) DEFAULT NULL,
+    `subjectCode` varchar(30) DEFAULT NULL,
+    `subjectName` varchar(50) DEFAULT NULL,
+    `seatNo`      varchar(30) DEFAULT NULL,
+    `statues`     varchar(30) DEFAULT NULL,
+    PRIMARY KEY (`examNumber`, `exam_id`) USING BTREE,
+    KEY           `PackageCode` (`packageCode`) USING BTREE,
+    KEY           `SubjectCode` (`subjectCode`) USING BTREE,
+    KEY           `Name` (`name`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
 
 -- ----------------------------
 -- Table structure for append_scan
 -- ----------------------------
 DROP TABLE IF EXISTS `append_scan`;
-CREATE TABLE `append_scan` (
-  `save_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
-  `exam_id` int(11) NOT NULL,
-  `exam_site` varchar(50) DEFAULT NULL,
-  `student_code` varchar(30) DEFAULT NULL,
-  `exam_number` varchar(30) NOT NULL,
-  `subject_code` varchar(30) DEFAULT NULL,
-  `sheet_count` int(5) DEFAULT NULL,
-  `slice_count` int(5) DEFAULT NULL,
-  `append_count` int(5) DEFAULT NULL,
-  `result_value` varchar(100) DEFAULT NULL,
-  `check_status` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`exam_id`,`exam_number`),
-  UNIQUE KEY `exam_id` (`exam_id`,`exam_number`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+CREATE TABLE `append_scan`
+(
+    `save_time`    timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+    `exam_id`      int(11) NOT NULL,
+    `exam_site`    varchar(50)  DEFAULT NULL,
+    `student_code` varchar(30)  DEFAULT NULL,
+    `exam_number`  varchar(30) NOT NULL,
+    `subject_code` varchar(30)  DEFAULT NULL,
+    `sheet_count`  int(5) DEFAULT NULL,
+    `slice_count`  int(5) DEFAULT NULL,
+    `append_count` int(5) DEFAULT NULL,
+    `result_value` varchar(100) DEFAULT NULL,
+    `check_status` varchar(10)  DEFAULT NULL,
+    PRIMARY KEY (`exam_id`, `exam_number`) USING BTREE,
+    UNIQUE KEY `exam_id` (`exam_id`,`exam_number`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
 
 -- ----------------------------
 -- Table structure for baseinfo
 -- ----------------------------
 DROP TABLE IF EXISTS `baseinfo`;
-CREATE TABLE `baseinfo` (
-  `examId` int(11) NOT NULL,
-  `disk_name` varchar(50) NOT NULL,
-  `disk_serno` varchar(50) DEFAULT NULL,
-  `BatchNO` varchar(30) DEFAULT NULL,
-  `BatchNum` int(10) DEFAULT NULL,
-  `ClipCount` int(5) DEFAULT NULL,
-  `KgtCount` int(5) DEFAULT NULL,
-  `ClipRect` varchar(1000) DEFAULT NULL,
-  `conver` int(1) DEFAULT NULL,
-  PRIMARY KEY (`examId`,`disk_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+CREATE TABLE `baseinfo`
+(
+    `examId`     int(11) NOT NULL,
+    `disk_name`  varchar(50) NOT NULL,
+    `disk_serno` varchar(50)   DEFAULT NULL,
+    `BatchNO`    varchar(30)   DEFAULT NULL,
+    `BatchNum`   int(10) DEFAULT NULL,
+    `ClipCount`  int(5) DEFAULT NULL,
+    `KgtCount`   int(5) DEFAULT NULL,
+    `ClipRect`   varchar(1000) DEFAULT NULL,
+    `conver`     int(1) DEFAULT NULL,
+    `isOnLine`   smallint(1) DEFAULT NULL,
+    PRIMARY KEY (`examId`, `disk_name`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
 
 -- ----------------------------
 -- Table structure for baseinfolog
 -- ----------------------------
 DROP TABLE IF EXISTS `baseinfolog`;
-CREATE TABLE `baseinfolog` (
-  `examID` int(11) DEFAULT NULL,
-  `DiskSerNo` varchar(50) DEFAULT NULL,
-  `FormID` int(3) DEFAULT NULL,
-  `ClipCount` int(3) DEFAULT NULL,
-  `KgtCount` int(3) DEFAULT NULL,
-  `EDateTime` datetime DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+CREATE TABLE `baseinfolog`
+(
+    `examID`    int(11) DEFAULT NULL,
+    `DiskSerNo` varchar(50) DEFAULT NULL,
+    `FormID`    int(3) DEFAULT NULL,
+    `ClipCount` int(3) DEFAULT NULL,
+    `KgtCount`  int(3) DEFAULT NULL,
+    `EDateTime` datetime    DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
 
 -- ----------------------------
 -- Table structure for campus
 -- ----------------------------
 DROP TABLE IF EXISTS `campus`;
-CREATE TABLE `campus` (
-  `campus_name` varchar(50) DEFAULT NULL,
-  `PackageCode` varchar(30) NOT NULL,
-  `picCount` int(3) DEFAULT NULL,
-  `exam_id` int(11) NOT NULL,
-  `Status` int(2) DEFAULT NULL,
-  PRIMARY KEY (`PackageCode`,`exam_id`),
-  KEY `camp_Id` (`PackageCode`,`exam_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+CREATE TABLE `campus`
+(
+    `campus_name` varchar(50) DEFAULT NULL,
+    `PackageCode` varchar(30) NOT NULL,
+    `picCount`    int(3) DEFAULT NULL,
+    `exam_id`     int(11) NOT NULL,
+    `Status`      int(2) DEFAULT NULL,
+    PRIMARY KEY (`PackageCode`, `exam_id`) USING BTREE,
+    KEY           `camp_Id` (`PackageCode`,`exam_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
 
 -- ----------------------------
 -- Table structure for card_defcount
 -- ----------------------------
 DROP TABLE IF EXISTS `card_defcount`;
-CREATE TABLE `card_defcount` (
-  `exam_id` int(11) NOT NULL,
-  `check_Code` varchar(30) NOT NULL,
-  `Card_DefCount` int(3) DEFAULT NULL,
-  PRIMARY KEY (`exam_id`,`check_Code`),
-  KEY `exam_id` (`exam_id`,`check_Code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+CREATE TABLE `card_defcount`
+(
+    `exam_id`       int(11) NOT NULL,
+    `check_Code`    varchar(30) NOT NULL,
+    `Card_DefCount` int(3) DEFAULT NULL,
+    PRIMARY KEY (`exam_id`, `check_Code`) USING BTREE,
+    KEY             `exam_id` (`exam_id`,`check_Code`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
 
 -- ----------------------------
 -- Table structure for check_omr
 -- ----------------------------
 DROP TABLE IF EXISTS `check_omr`;
-CREATE TABLE `check_omr` (
-  `exam_id` int(11) NOT NULL,
-  `student_id` varchar(30) NOT NULL,
-  `subject_code` varchar(30) NOT NULL,
-  `exam_number` varchar(30) NOT NULL,
-  `sheetSrc` longtext,
-  `check_times` varchar(30) DEFAULT NULL,
-  `check_status` int(5) DEFAULT NULL,
-  `check_ip` varchar(30) DEFAULT NULL,
-  `newAnswer` longtext,
-  `mark_dth` longtext,
-  `admin_check_Ip` varchar(30) DEFAULT NULL,
-  `admin_check_status` int(5) DEFAULT NULL,
-  PRIMARY KEY (`exam_id`,`exam_number`),
-  KEY `check_ip` (`check_ip`) USING BTREE,
-  KEY `check_status` (`check_status`) USING BTREE,
-  KEY `exam_number` (`exam_number`),
-  KEY `exam_id` (`exam_id`),
-  KEY `mark_dth` (`mark_dth`(768)),
-  KEY `admin_check_Ip` (`admin_check_Ip`),
-  KEY `admin_check_status` (`admin_check_status`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+CREATE TABLE `check_omr`
+(
+    `exam_id`                int(11) NOT NULL,
+    `student_id`             varchar(30) NOT NULL,
+    `subject_code`           varchar(30) NOT NULL,
+    `exam_number`            varchar(30) NOT NULL,
+    `sheetSrc`               longtext,
+    `check_times`            varchar(30)  DEFAULT NULL,
+    `check_status`           int(5) DEFAULT NULL,
+    `check_ip`               varchar(30)  DEFAULT NULL,
+    `mark_xth`               longtext,
+    `newAnswer`              longtext,
+    `admin_check_Ip`         varchar(30)  DEFAULT NULL,
+    `admin_check_status`     int(5) DEFAULT NULL,
+    `admin_mark_xth`         longtext,
+    `check_history1`         varchar(255) DEFAULT NULL,
+    `admin_mark_xth_history` longtext,
+    PRIMARY KEY (`exam_id`, `exam_number`) USING BTREE,
+    KEY                      `check_ip` (`check_ip`) USING BTREE,
+    KEY                      `check_status` (`check_status`) USING BTREE,
+    KEY                      `exam_number` (`exam_number`) USING BTREE,
+    KEY                      `exam_id` (`exam_id`) USING BTREE,
+    KEY                      `admin_check_Ip` (`admin_check_Ip`) USING BTREE,
+    KEY                      `admin_check_status` (`admin_check_status`) USING BTREE,
+    KEY                      `mark_xth` (`mark_xth`(768)) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
 
 -- ----------------------------
 -- Table structure for check_student
 -- ----------------------------
 DROP TABLE IF EXISTS `check_student`;
-CREATE TABLE `check_student` (
-  `exam_id` int(11) NOT NULL,
-  `exam_site` varchar(50) DEFAULT NULL,
-  `student_code` varchar(50) DEFAULT NULL,
-  `exam_number` varchar(30) NOT NULL,
-  `name` varchar(50) DEFAULT NULL,
-  `subject_code` varchar(30) DEFAULT NULL,
-  `subject_name` varchar(50) DEFAULT NULL,
-  `is_upload` tinyint(1) NOT NULL DEFAULT '0',
-  `scan_misspage_page` varchar(128) DEFAULT NULL,
-  `ocrdata_scan_count` int(3) DEFAULT NULL,
-  `ocrdata_scan_page` varchar(128) DEFAULT NULL,
-  `sign_scan_count` int(3) DEFAULT NULL,
-  `sign_scan_page` varchar(128) DEFAULT NULL,
-  `card_def_count` int(3) DEFAULT NULL,
-  `misspage` varchar(200) DEFAULT NULL,
-  `remark` varchar(200) DEFAULT NULL,
-  PRIMARY KEY (`exam_id`,`exam_number`),
-  KEY `exam_site` (`exam_site`),
-  KEY `ocrdata_scan_page` (`ocrdata_scan_page`),
-  KEY `sign_scan_page` (`sign_scan_page`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+CREATE TABLE `check_student`
+(
+    `exam_id`            int(11) NOT NULL,
+    `exam_site`          varchar(50)  DEFAULT NULL,
+    `student_code`       varchar(50)  DEFAULT NULL,
+    `exam_number`        varchar(30) NOT NULL,
+    `name`               varchar(50)  DEFAULT NULL,
+    `subject_code`       varchar(30)  DEFAULT NULL,
+    `subject_name`       varchar(50)  DEFAULT NULL,
+    `is_upload`          tinyint(1) NOT NULL DEFAULT '0',
+    `scan_misspage_page` varchar(128) DEFAULT NULL,
+    `ocrdata_scan_count` int(3) DEFAULT NULL,
+    `ocrdata_scan_page`  varchar(128) DEFAULT NULL,
+    `sign_scan_count`    int(3) DEFAULT NULL,
+    `sign_scan_page`     varchar(128) DEFAULT NULL,
+    `card_def_count`     int(3) DEFAULT NULL,
+    `misspage`           varchar(200) DEFAULT NULL,
+    `remark`             varchar(200) DEFAULT NULL,
+    PRIMARY KEY (`exam_id`, `exam_number`) USING BTREE,
+    KEY                  `exam_site` (`exam_site`) USING BTREE,
+    KEY                  `ocrdata_scan_page` (`ocrdata_scan_page`) USING BTREE,
+    KEY                  `sign_scan_page` (`sign_scan_page`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
 
 -- ----------------------------
 -- Table structure for cliprect
 -- ----------------------------
 DROP TABLE IF EXISTS `cliprect`;
-CREATE TABLE `cliprect` (
-  `ExamID` int(11) DEFAULT NULL,
-  `DiskSerNo` varchar(30) DEFAULT NULL,
-  `FormID` int(3) DEFAULT NULL,
-  `ClipCount` int(3) DEFAULT NULL,
-  `ClitRect` longtext
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+CREATE TABLE `cliprect`
+(
+    `ExamID`    int(11) DEFAULT NULL,
+    `DiskSerNo` varchar(30) DEFAULT NULL,
+    `FormID`    int(3) DEFAULT NULL,
+    `ClipCount` int(3) DEFAULT NULL,
+    `ClitRect`  longtext
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
 
 -- ----------------------------
 -- Table structure for config
 -- ----------------------------
 DROP TABLE IF EXISTS `config`;
-CREATE TABLE `config` (
-  `exam_id` int(11) NOT NULL,
-  `config` longtext,
-  PRIMARY KEY (`exam_id`),
-  UNIQUE KEY `exam_id` (`exam_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+CREATE TABLE `config`
+(
+    `exam_id` int(11) NOT NULL,
+    `config`  longtext,
+    PRIMARY KEY (`exam_id`) USING BTREE,
+    UNIQUE KEY `exam_id` (`exam_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
 
 -- ----------------------------
 -- Table structure for eb_exam_student
 -- ----------------------------
 DROP TABLE IF EXISTS `eb_exam_student`;
-CREATE TABLE `eb_exam_student` (
-  `auid` int(11) NOT NULL AUTO_INCREMENT,
-  `exam_id` int(11) NOT NULL COMMENT '考试ID',
-  `school_id` int(11) NOT NULL COMMENT '学校ID',
-  `campus_code` int(11) NOT NULL DEFAULT '0',
-  `campus_name` varchar(64) DEFAULT NULL COMMENT '学习中心名称',
-  `subject_code` varchar(32) NOT NULL COMMENT '科目代码',
-  `subject_name` varchar(128) DEFAULT NULL,
-  `student_id` int(11) DEFAULT NULL,
-  `secret_number` varchar(64) DEFAULT NULL,
-  `exam_number` varchar(64) NOT NULL COMMENT '准考证号',
-  `student_code` varchar(64) NOT NULL COMMENT '学号',
-  `name` varchar(64) NOT NULL COMMENT '姓名',
-  `package_code` varchar(64) DEFAULT NULL COMMENT '试卷袋编号',
-  `exam_site` varchar(32) DEFAULT NULL COMMENT '考点',
-  `exam_room` varchar(32) DEFAULT NULL COMMENT '考场',
-  `remark` varchar(128) DEFAULT NULL COMMENT '备注',
-  `subject_level` varchar(64) DEFAULT NULL COMMENT '层次',
-  `subject_category` varchar(64) DEFAULT NULL COMMENT '专业类型',
-  `college` varchar(64) NOT NULL COMMENT '学院',
-  `class_name` varchar(64) NOT NULL COMMENT '班级',
-  `teacher` varchar(64) NOT NULL COMMENT '任课老师',
-  `is_upload` tinyint(1) unsigned zerofill NOT NULL DEFAULT '0',
-  PRIMARY KEY (`exam_id`,`exam_number`),
-  UNIQUE KEY `auid` (`auid`),
-  KEY `subject_code` (`subject_code`),
-  KEY `exam_number` (`exam_number`),
-  KEY `student_code` (`student_code`),
-  KEY `package_code` (`package_code`),
-  KEY `exam_site` (`exam_site`),
-  KEY `exam_room` (`exam_room`)
-) ENGINE=InnoDB AUTO_INCREMENT=240437 DEFAULT CHARSET=utf8mb4;
+CREATE TABLE `eb_exam_student`
+(
+    `auid`             int(11) NOT NULL AUTO_INCREMENT,
+    `exam_id`          int(11) NOT NULL COMMENT '考试ID',
+    `school_id`        int(11) NOT NULL COMMENT '学校ID',
+    `campus_code`      int(11) NOT NULL DEFAULT '0',
+    `campus_name`      varchar(64)  DEFAULT NULL COMMENT '学习中心名称',
+    `subject_code`     varchar(32) NOT NULL COMMENT '科目代码',
+    `subject_name`     varchar(128) DEFAULT NULL,
+    `student_id`       int(11) DEFAULT NULL,
+    `secret_number`    varchar(64)  DEFAULT NULL,
+    `exam_number`      varchar(64) NOT NULL COMMENT '准考证号',
+    `student_code`     varchar(64) NOT NULL COMMENT '学号',
+    `name`             varchar(64) NOT NULL COMMENT '姓名',
+    `package_code`     varchar(64)  DEFAULT NULL COMMENT '试卷袋编号',
+    `exam_site`        varchar(32)  DEFAULT NULL COMMENT '考点',
+    `exam_room`        varchar(32)  DEFAULT NULL COMMENT '考场',
+    `remark`           varchar(128) DEFAULT NULL COMMENT '备注',
+    `subject_level`    varchar(64)  DEFAULT NULL COMMENT '层次',
+    `subject_category` varchar(64)  DEFAULT NULL COMMENT '专业类型',
+    `college`          varchar(64) NOT NULL COMMENT '学院',
+    `class_name`       varchar(64) NOT NULL COMMENT '班级',
+    `teacher`          varchar(64) NOT NULL COMMENT '任课老师',
+    `is_upload`        tinyint(1) unsigned zerofill NOT NULL DEFAULT '0',
+    PRIMARY KEY (`exam_id`, `exam_number`) USING BTREE,
+    UNIQUE KEY `auid` (`auid`) USING BTREE,
+    KEY                `subject_code` (`subject_code`) USING BTREE,
+    KEY                `exam_number` (`exam_number`) USING BTREE,
+    KEY                `student_code` (`student_code`) USING BTREE,
+    KEY                `package_code` (`package_code`) USING BTREE,
+    KEY                `exam_site` (`exam_site`) USING BTREE,
+    KEY                `exam_room` (`exam_room`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
 
 -- ----------------------------
 -- Table structure for import_sign_page
 -- ----------------------------
 DROP TABLE IF EXISTS `import_sign_page`;
-CREATE TABLE `import_sign_page` (
-  `exam_id` int(5) NOT NULL,
-  `exam_site` varchar(50) DEFAULT NULL,
-  `exam_room` varchar(100) DEFAULT NULL,
-  `student_code` varchar(50) NOT NULL,
-  `student_name` varchar(100) DEFAULT NULL,
-  `subject_code` varchar(30) NOT NULL,
-  `subject_name` varchar(50) DEFAULT NULL,
-  `exam_number` varchar(20) DEFAULT NULL,
-  `pagelist` varchar(50) DEFAULT NULL,
-  `is_absent` int(2) DEFAULT NULL,
-  `edit_time` varchar(30) DEFAULT NULL,
-  `edit_user` varchar(50) DEFAULT NULL,
-  PRIMARY KEY (`exam_id`,`student_code`,`subject_code`),
-  KEY `student_code_2` (`student_code`),
-  KEY `exam_number` (`exam_number`),
-  KEY `subject_code` (`subject_code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+CREATE TABLE `import_sign_page`
+(
+    `exam_id`      int(5) NOT NULL,
+    `exam_site`    varchar(50)  DEFAULT NULL,
+    `exam_room`    varchar(100) DEFAULT NULL,
+    `student_code` varchar(50) NOT NULL,
+    `student_name` varchar(100) DEFAULT NULL,
+    `subject_code` varchar(30) NOT NULL,
+    `subject_name` varchar(50)  DEFAULT NULL,
+    `exam_number`  varchar(20)  DEFAULT NULL,
+    `pagelist`     varchar(50)  DEFAULT NULL,
+    `is_absent`    int(2) DEFAULT NULL,
+    `edit_time`    varchar(30)  DEFAULT NULL,
+    `edit_user`    varchar(50)  DEFAULT NULL,
+    PRIMARY KEY (`exam_id`, `student_code`, `subject_code`) USING BTREE,
+    KEY            `student_code_2` (`student_code`) USING BTREE,
+    KEY            `exam_number` (`exam_number`) USING BTREE,
+    KEY            `subject_code` (`subject_code`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
 
 -- ----------------------------
 -- Table structure for kslb
 -- ----------------------------
 DROP TABLE IF EXISTS `kslb`;
-CREATE TABLE `kslb` (
-  `zkzh` varchar(500) DEFAULT NULL,
-  `xm` varchar(500) DEFAULT NULL,
-  `ys` int(11) DEFAULT NULL
+CREATE TABLE `kslb`
+(
+    `zkzh` varchar(500) DEFAULT NULL,
+    `xm`   varchar(500) DEFAULT NULL,
+    `ys`   int(11) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT;
 
 -- ----------------------------
 -- Table structure for objective
 -- ----------------------------
 DROP TABLE IF EXISTS `objective`;
-CREATE TABLE `objective` (
-  `DiskSerNo` varchar(50) DEFAULT NULL,
-  `ExamID` int(11) NOT NULL,
-  `SubjectCode` varchar(30) NOT NULL,
-  `jData` longtext,
-  `ChoStart` int(10) DEFAULT '0',
-  `ChoEnd` int(10) DEFAULT '0',
-  `MulitChoStart` int(10) DEFAULT '0',
-  `MulitChoEnd` int(10) DEFAULT '0',
-  `JudgeStart` int(10) DEFAULT '0',
-  `JudgeEnd` int(10) DEFAULT '0',
-  `mark` int(10) DEFAULT '0',
-  `JudegMark` int(10) DEFAULT '0',
-  `logtime` datetime DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+CREATE TABLE `objective`
+(
+    `DiskSerNo`     varchar(50) DEFAULT NULL,
+    `ExamID`        int(11) NOT NULL,
+    `SubjectCode`   varchar(30) NOT NULL,
+    `jData`         longtext,
+    `ChoStart`      int(10) DEFAULT '0',
+    `ChoEnd`        int(10) DEFAULT '0',
+    `MulitChoStart` int(10) DEFAULT '0',
+    `MulitChoEnd`   int(10) DEFAULT '0',
+    `JudgeStart`    int(10) DEFAULT '0',
+    `JudgeEnd`      int(10) DEFAULT '0',
+    `mark`          int(10) DEFAULT '0',
+    `JudegMark`     int(10) DEFAULT '0',
+    `logtime`       datetime    DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
 
 -- ----------------------------
 -- Table structure for ocrdata
 -- ----------------------------
 DROP TABLE IF EXISTS `ocrdata`;
-CREATE TABLE `ocrdata` (
-  `DiskSerNo` varchar(50) DEFAULT NULL,
-  `DiskSerNo_KGT` varchar(50) DEFAULT NULL,
-  `Batch` varchar(10) DEFAULT NULL,
-  `DeviceId` int(5) DEFAULT NULL,
-  `ExamId` int(5) NOT NULL,
-  `CampusCode` varchar(5) DEFAULT NULL,
-  `CampusName` varchar(30) DEFAULT NULL,
-  `exam_site` varchar(50) DEFAULT NULL,
-  `college` varchar(64) DEFAULT NULL,
-  `SubjectCode` varchar(30) DEFAULT NULL,
-  `SubjectName` varchar(50) DEFAULT NULL,
-  `OCRTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `OCRUser` varchar(30) DEFAULT NULL,
-  `student_Code` varchar(50) DEFAULT NULL,
-  `ScanNumber` varchar(30) DEFAULT NULL,
-  `examNumber` varchar(30) NOT NULL,
-  `examName` varchar(50) DEFAULT NULL,
-  `StudentID` varchar(30) DEFAULT NULL,
-  `sheetSrc` longtext,
-  `sheetCount` int(3) DEFAULT NULL,
-  `sliceSrc` longtext,
-  `slicePic` longtext,
-  `sliceCount` int(3) DEFAULT NULL,
-  `absent` int(1) DEFAULT NULL,
-  `wj` int(1) DEFAULT NULL,
-  `check_absent_status` int(1) DEFAULT NULL,
-  `paper_type` varchar(5) DEFAULT NULL,
-  `card_type` varchar(50) DEFAULT NULL,
-  `card_name` varchar(50) DEFAULT NULL,
-  `omrUp` int(1) DEFAULT NULL,
-  `omrResult` longtext,
-  `FirstResult` longtext,
-  `SecondResult` longtext,
-  `FirstResultBack` longtext,
-  `SecondResultback` longtext,
-  `ScanRemark` longtext,
-  `kgtpoint` longtext,
-  `slicePoint` longtext,
-  `ans_checkIp1` varchar(30) DEFAULT NULL,
-  `ans_checkIp2` varchar(30) DEFAULT NULL,
-  `ans_checkIp3` varchar(30) DEFAULT NULL,
-  `misspage` varchar(30) DEFAULT NULL,
-  `misspageStatusCheck` varchar(10) DEFAULT NULL,
-  `ScanPagelist` varchar(30) DEFAULT NULL,
-  `scanPageCount` int(5) DEFAULT NULL,
-  `isUpload` int(3) NOT NULL DEFAULT '0',
-  `isUpload_kgt` int(3) NOT NULL DEFAULT '0',
-  `UpError` longtext,
-  `UploadTime` varchar(30) DEFAULT NULL,
-  `ServerPath` longtext,
-  `ServerAnswer` longtext,
-  `LoginName` varchar(30) DEFAULT '',
-  `loginPwd` varchar(30) DEFAULT NULL,
-  PRIMARY KEY (`ExamId`,`examNumber`),
-  KEY `fx_ExamId` (`ExamId`),
-  KEY `fx_CampusCode` (`CampusCode`),
-  KEY `fx_SubjectCode` (`SubjectCode`),
-  KEY `fx_examNumber` (`examNumber`),
-  KEY `fx_StudentID` (`StudentID`)
+CREATE TABLE `ocrdata`
+(
+    `DiskSerNo`           varchar(50)          DEFAULT NULL,
+    `DiskSerNo_KGT`       varchar(50)          DEFAULT NULL,
+    `Batch`               varchar(10)          DEFAULT NULL,
+    `DeviceId`            int(5) DEFAULT NULL,
+    `ExamId`              int(5) NOT NULL,
+    `CampusCode`          varchar(5)           DEFAULT NULL,
+    `CampusName`          varchar(30)          DEFAULT NULL,
+    `exam_site`           varchar(50)          DEFAULT NULL,
+    `college`             varchar(64)          DEFAULT NULL,
+    `SubjectCode`         varchar(30)          DEFAULT NULL,
+    `SubjectName`         varchar(50)          DEFAULT NULL,
+    `is_kgt_km`           int(1) DEFAULT NULL,
+    `OCRTime`             timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    `OCRUser`             varchar(30)          DEFAULT NULL,
+    `omr_repeat`          bit(1)               DEFAULT NULL,
+    `student_Code`        varchar(50)          DEFAULT NULL,
+    `ScanNumber`          varchar(30)          DEFAULT NULL,
+    `examNumber`          varchar(30) NOT NULL,
+    `examName`            varchar(50)          DEFAULT NULL,
+    `StudentID`           varchar(30)          DEFAULT NULL,
+    `sheetSrc`            longtext,
+    `sheetCount`          int(3) DEFAULT NULL,
+    `sliceSrc`            longtext,
+    `sliceCount`          int(3) DEFAULT NULL,
+    `absent`              int(1) DEFAULT NULL,
+    `wj`                  int(1) DEFAULT NULL,
+    `check_absent_status` int(1) DEFAULT NULL,
+    `paper_type`          varchar(5)           DEFAULT NULL,
+    `card_type`           varchar(50)          DEFAULT NULL,
+    `card_name`           varchar(50)          DEFAULT NULL,
+    `omrUp`               int(1) DEFAULT NULL,
+    `omrResult`           longtext,
+    `FirstResult`         longtext,
+    `SecondResult`        longtext,
+    `FirstResultBack`     longtext,
+    `SecondResultback`    longtext,
+    `ScanRemark`          longtext,
+    `kgtpoint`            longtext,
+    `slicePoint`          longtext,
+    `ans_checkIp1`        varchar(30)          DEFAULT NULL,
+    `ans_checkIp2`        varchar(30)          DEFAULT NULL,
+    `ans_checkIp3`        varchar(30)          DEFAULT NULL,
+    `misspage`            varchar(30)          DEFAULT NULL,
+    `misspageStatusCheck` varchar(10)          DEFAULT NULL,
+    `ScanPagelist`        varchar(30)          DEFAULT NULL,
+    `scanPageCount`       int(5) DEFAULT NULL,
+    `isUpload`            int(3) NOT NULL DEFAULT '0',
+    `isUpload_kgt`        int(1) DEFAULT NULL,
+    `UpError`             longtext,
+    `UploadTime`          varchar(30)          DEFAULT NULL,
+    `ServerPath`          longtext,
+    `ServerAnswer`        longtext,
+    `LoginName`           varchar(30)          DEFAULT '',
+    `loginPwd`            varchar(30)          DEFAULT NULL,
+    PRIMARY KEY (`ExamId`, `examNumber`) USING BTREE,
+    KEY                   `fx_ExamId` (`ExamId`) USING BTREE,
+    KEY                   `fx_CampusCode` (`CampusCode`) USING BTREE,
+    KEY                   `fx_SubjectCode` (`SubjectCode`) USING BTREE,
+    KEY                   `fx_examNumber` (`examNumber`) USING BTREE,
+    KEY                   `fx_StudentID` (`StudentID`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT;
 
 -- ----------------------------
 -- Table structure for ocrdata_history
 -- ----------------------------
 DROP TABLE IF EXISTS `ocrdata_history`;
-CREATE TABLE `ocrdata_history` (
-  `remark` varchar(100) DEFAULT NULL,
-  `DiskSerNo` varchar(50) DEFAULT NULL,
-  `DiskSerNo_KGT` varchar(50) DEFAULT NULL,
-  `Batch` varchar(10) DEFAULT NULL,
-  `DeviceId` int(5) DEFAULT NULL,
-  `ExamId` int(5) NOT NULL,
-  `CampusCode` varchar(5) DEFAULT NULL,
-  `CampusName` varchar(30) DEFAULT NULL,
-  `exam_site` varchar(50) DEFAULT NULL,
-  `college` varchar(64) DEFAULT NULL,
-  `SubjectCode` varchar(30) DEFAULT NULL,
-  `SubjectName` varchar(50) DEFAULT NULL,
-  `OCRTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `OCRUser` varchar(30) DEFAULT NULL,
-  `student_Code` varchar(50) DEFAULT NULL,
-  `ScanNumber` varchar(30) DEFAULT NULL,
-  `examNumber` varchar(30) NOT NULL,
-  `examName` varchar(50) DEFAULT NULL,
-  `StudentID` varchar(30) DEFAULT NULL,
-  `sheetSrc` longtext,
-  `sheetCount` int(3) DEFAULT NULL,
-  `sliceSrc` longtext,
-  `slicePic` longtext,
-  `sliceCount` int(3) DEFAULT NULL,
-  `absent` int(1) DEFAULT NULL,
-  `wj` int(1) DEFAULT NULL,
-  `check_absent_status` int(1) DEFAULT NULL,
-  `paper_type` varchar(5) DEFAULT NULL,
-  `card_type` varchar(50) DEFAULT NULL,
-  `card_name` varchar(50) DEFAULT NULL,
-  `omrUp` int(1) DEFAULT NULL,
-  `omrResult` longtext,
-  `FirstResult` longtext,
-  `SecondResult` longtext,
-  `ScanRemark` longtext,
-  `kgtpoint` longtext,
-  `slicePoint` longtext,
-  `ScanPagelist` varchar(30) DEFAULT NULL,
-  `scanPageCount` int(5) DEFAULT NULL,
-  `isUpload` int(3) DEFAULT '0',
-  `isUpload_kgt` int(3) DEFAULT '0',
-  KEY `ExamId` (`ExamId`),
-  KEY `SubjectCode` (`SubjectCode`),
-  KEY `examNumber` (`examNumber`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+CREATE TABLE `ocrdata_history`
+(
+    `remark`              varchar(100)         DEFAULT NULL,
+    `DiskSerNo`           varchar(50)          DEFAULT NULL,
+    `DiskSerNo_KGT`       varchar(50)          DEFAULT NULL,
+    `Batch`               varchar(10)          DEFAULT NULL,
+    `DeviceId`            int(5) DEFAULT NULL,
+    `ExamId`              int(5) NOT NULL,
+    `CampusCode`          varchar(5)           DEFAULT NULL,
+    `CampusName`          varchar(30)          DEFAULT NULL,
+    `exam_site`           varchar(50)          DEFAULT NULL,
+    `college`             varchar(64)          DEFAULT NULL,
+    `SubjectCode`         varchar(30)          DEFAULT NULL,
+    `SubjectName`         varchar(50)          DEFAULT NULL,
+    `OCRTime`             timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    `OCRUser`             varchar(30)          DEFAULT NULL,
+    `student_Code`        varchar(50)          DEFAULT NULL,
+    `ScanNumber`          varchar(30)          DEFAULT NULL,
+    `examNumber`          varchar(30) NOT NULL,
+    `examName`            varchar(50)          DEFAULT NULL,
+    `StudentID`           varchar(30)          DEFAULT NULL,
+    `sheetSrc`            longtext,
+    `sheetCount`          int(3) DEFAULT NULL,
+    `sliceSrc`            longtext,
+    `slicePic`            longtext,
+    `sliceCount`          int(3) DEFAULT NULL,
+    `absent`              int(1) DEFAULT NULL,
+    `wj`                  int(1) DEFAULT NULL,
+    `check_absent_status` int(1) DEFAULT NULL,
+    `paper_type`          varchar(5)           DEFAULT NULL,
+    `card_type`           varchar(50)          DEFAULT NULL,
+    `card_name`           varchar(50)          DEFAULT NULL,
+    `omrUp`               int(1) DEFAULT NULL,
+    `omrResult`           longtext,
+    `FirstResult`         longtext,
+    `SecondResult`        longtext,
+    `ScanRemark`          longtext,
+    `kgtpoint`            longtext,
+    `slicePoint`          longtext,
+    `ScanPagelist`        varchar(30)          DEFAULT NULL,
+    `scanPageCount`       int(5) DEFAULT NULL,
+    `isUpload`            int(3) DEFAULT '0',
+    `isUpload_kgt`        int(3) DEFAULT '0',
+    KEY                   `ExamId` (`ExamId`) USING BTREE,
+    KEY                   `SubjectCode` (`SubjectCode`) USING BTREE,
+    KEY                   `examNumber` (`examNumber`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
+
+-- ----------------------------
+-- Table structure for ocrdata_objective
+-- ----------------------------
+DROP TABLE IF EXISTS `ocrdata_objective`;
+CREATE TABLE `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;
 
 -- ----------------------------
 -- Table structure for omrresult
 -- ----------------------------
 DROP TABLE IF EXISTS `omrresult`;
-CREATE TABLE `omrresult` (
-  `examid` int(11) DEFAULT '0',
-  `subjectCode` varchar(30) DEFAULT NULL,
-  `examNumber` varchar(30) DEFAULT '',
-  `FirstResult` longtext,
-  `SecondResult` longtext,
-  `newFirstResult` longtext,
-  `newSecondResult` longtext,
-  `newFirst` longtext,
-  `newSecond` longtext,
-  `Status` int(1) DEFAULT NULL,
-  KEY `FirstResult` (`FirstResult`(250)),
-  KEY `SecondResult` (`SecondResult`(250))
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+CREATE TABLE `omrresult`
+(
+    `examid`          int(11) DEFAULT '0',
+    `subjectCode`     varchar(30) DEFAULT NULL,
+    `examNumber`      varchar(30) DEFAULT '',
+    `FirstResult`     longtext,
+    `SecondResult`    longtext,
+    `newFirstResult`  longtext,
+    `newSecondResult` longtext,
+    `newFirst`        longtext,
+    `newSecond`       longtext,
+    `Status`          int(1) DEFAULT NULL,
+    KEY               `FirstResult` (`FirstResult`(250)) USING BTREE,
+    KEY               `SecondResult` (`SecondResult`(250)) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
+
+-- ----------------------------
+-- Table structure for omr_picture_data
+-- ----------------------------
+DROP TABLE IF EXISTS `omr_picture_data`;
+CREATE TABLE `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;
 
 -- ----------------------------
 -- Table structure for registno
 -- ----------------------------
 DROP TABLE IF EXISTS `registno`;
-CREATE TABLE `registno` (
-  `DiskSerNo` varchar(30) DEFAULT NULL,
-  `ExamId` int(11) NOT NULL,
-  `RegistNo` varchar(30) NOT NULL,
-  `OCRTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `PicSrc` longtext,
-  `RegistCount` int(3) DEFAULT NULL,
-  `isUpload` int(1) NOT NULL DEFAULT '0',
-  `UpError` varchar(255) DEFAULT NULL,
-  `UploadTime` varchar(30) DEFAULT NULL,
-  `ServerPath` longtext,
-  `ServerAnswer` longtext,
-  `LoginName` varchar(30) DEFAULT NULL,
-  `loginPwd` varchar(30) DEFAULT NULL,
-  PRIMARY KEY (`ExamId`,`RegistNo`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+CREATE TABLE `registno`
+(
+    `DiskSerNo`    varchar(30)          DEFAULT NULL,
+    `ExamId`       int(11) NOT NULL,
+    `RegistNo`     varchar(30) NOT NULL,
+    `OCRTime`      timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    `PicSrc`       longtext,
+    `RegistCount`  int(3) DEFAULT NULL,
+    `isUpload`     int(1) NOT NULL DEFAULT '0',
+    `UpError`      varchar(255)         DEFAULT NULL,
+    `UploadTime`   varchar(30)          DEFAULT NULL,
+    `ServerPath`   longtext,
+    `ServerAnswer` longtext,
+    `LoginName`    varchar(30)          DEFAULT NULL,
+    `loginPwd`     varchar(30)          DEFAULT NULL,
+    PRIMARY KEY (`ExamId`, `RegistNo`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
 
 -- ----------------------------
 -- Table structure for registqty
 -- ----------------------------
 DROP TABLE IF EXISTS `registqty`;
-CREATE TABLE `registqty` (
-  `DiskSerNo` varchar(30) NOT NULL,
-  `Batch` varchar(30) NOT NULL,
-  `Qty` varchar(10) DEFAULT NULL,
-  PRIMARY KEY (`DiskSerNo`,`Batch`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+CREATE TABLE `registqty`
+(
+    `DiskSerNo` varchar(30) NOT NULL,
+    `Batch`     varchar(30) NOT NULL,
+    `Qty`       varchar(10) DEFAULT NULL,
+    PRIMARY KEY (`DiskSerNo`, `Batch`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
 
 -- ----------------------------
 -- Table structure for sign_page
 -- ----------------------------
 DROP TABLE IF EXISTS `sign_page`;
-CREATE TABLE `sign_page` (
-  `exam_id` int(11) NOT NULL,
-  `exam_number` varchar(30) NOT NULL,
-  `exam_site` varchar(50) DEFAULT NULL,
-  `college` varchar(64) DEFAULT NULL,
-  `page_no` varchar(11) NOT NULL,
-  `xh` int(10) NOT NULL,
-  `Card_DefCount` int(3) DEFAULT NULL,
-  `subject_code` varchar(30) DEFAULT NULL,
-  `sign_page_src` longtext,
-  `scan_remark` longtext,
-  `Card_type` varchar(50) DEFAULT NULL,
-  `img_name` varchar(50) NOT NULL,
-  `is_upload` tinyint(1) unsigned zerofill NOT NULL DEFAULT '0',
-  `DiskSerNo` varchar(30) DEFAULT NULL,
-  `check_status` int(2) DEFAULT NULL,
-  PRIMARY KEY (`img_name`,`xh`,`exam_id`),
-  KEY `exam_number` (`exam_number`,`exam_site`,`page_no`,`subject_code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+CREATE TABLE `sign_page`
+(
+    `exam_id`       int(11) NOT NULL,
+    `exam_number`   varchar(30) NOT NULL,
+    `exam_site`     varchar(50) DEFAULT NULL,
+    `college`       varchar(64) DEFAULT NULL,
+    `page_no`       varchar(11) NOT NULL,
+    `xh`            int(10) NOT NULL,
+    `Card_DefCount` int(3) DEFAULT NULL,
+    `subject_code`  varchar(30) DEFAULT NULL,
+    `sign_page_src` longtext,
+    `scan_remark`   longtext,
+    `Card_type`     varchar(50) DEFAULT NULL,
+    `img_name`      varchar(50) NOT NULL,
+    `is_upload`     tinyint(1) unsigned zerofill NOT NULL DEFAULT '0',
+    `DiskSerNo`     varchar(30) DEFAULT NULL,
+    `check_status`  int(2) DEFAULT NULL,
+    PRIMARY KEY (`img_name`, `xh`, `exam_id`) USING BTREE,
+    KEY             `exam_number` (`exam_number`,`exam_site`,`page_no`,`subject_code`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
 
 -- ----------------------------
 -- Table structure for subject_code_kgt
 -- ----------------------------
 DROP TABLE IF EXISTS `subject_code_kgt`;
-CREATE TABLE `subject_code_kgt` (
-  `exam_id` int(11) NOT NULL,
-  `subject_code` varchar(30) NOT NULL,
-  `subject_name` varchar(50) DEFAULT NULL,
-  PRIMARY KEY (`exam_id`,`subject_code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+CREATE TABLE `subject_code_kgt`
+(
+    `exam_id`      int(11) NOT NULL,
+    `subject_code` varchar(30) NOT NULL,
+    `subject_name` varchar(50) DEFAULT NULL,
+    PRIMARY KEY (`exam_id`, `subject_code`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
+
+-- ----------------------------
+-- Table structure for task_ans_check_child
+-- ----------------------------
+DROP TABLE IF EXISTS `task_ans_check_child`;
+CREATE TABLE `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;
 
 -- ----------------------------
 -- Table structure for task_child
 -- ----------------------------
 DROP TABLE IF EXISTS `task_child`;
-CREATE TABLE `task_child` (
-  `exam_id` int(11) NOT NULL,
-  `exam_number` varchar(30) NOT NULL,
-  `task_id` varchar(30) NOT NULL,
-  `check_times1` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `check_ip1` varchar(30) DEFAULT NULL,
-  `check_status1` varchar(30) DEFAULT NULL,
-  PRIMARY KEY (`exam_id`,`exam_number`,`task_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+CREATE TABLE `task_child`
+(
+    `exam_id`       int(11) NOT NULL,
+    `exam_number`   varchar(30) NOT NULL,
+    `task_id`       varchar(30) NOT NULL,
+    `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_id` (`exam_id`) USING BTREE,
+    KEY             `exam_number` (`exam_number`) USING BTREE,
+    KEY             `task_id` (`task_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
 
 -- ----------------------------
 -- Table structure for task_master
 -- ----------------------------
 DROP TABLE IF EXISTS `task_master`;
-CREATE TABLE `task_master` (
-  `exam_id` int(11) NOT NULL,
-  `task_id` varchar(30) NOT NULL,
-  `task_type` int(1) DEFAULT NULL,
-  `task_times` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `task_name` varchar(200) DEFAULT NULL,
-  `task_remark` varchar(100) DEFAULT NULL,
-  `task_valid` int(5) DEFAULT NULL,
-  `task_where` longtext,
-  PRIMARY KEY (`exam_id`,`task_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+CREATE TABLE `task_master`
+(
+    `exam_id`       int(11) NOT NULL,
+    `task_id`       varchar(30) NOT NULL,
+    `task_class`    varchar(100) DEFAULT NULL,
+    `task_type`     int(1) DEFAULT NULL,
+    `task_xh`       int(3) DEFAULT NULL,
+    `task_times`    timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    `task_name`     varchar(200) DEFAULT NULL,
+    `task_remark`   varchar(100) DEFAULT NULL,
+    `task_valid`    int(5) DEFAULT NULL,
+    `task_where`    longtext,
+    `task_ui_where` longtext,
+    PRIMARY KEY (`exam_id`, `task_id`) USING BTREE,
+    KEY             `task_id` (`task_id`) USING BTREE,
+    KEY             `task_class` (`task_class`) USING BTREE,
+    KEY             `task_xh` (`task_xh`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
 
 -- ----------------------------
 -- Table structure for upload_file_list
 -- ----------------------------
 DROP TABLE IF EXISTS `upload_file_list`;
-CREATE TABLE `upload_file_list` (
-  `exam_id` int(11) NOT NULL,
-  `subject_code` varchar(30) NOT NULL,
-  `subject_name` varchar(50) DEFAULT NULL,
-  `is_used` int(1) DEFAULT NULL,
-  `file_description` varchar(100) NOT NULL,
-  `file_type` int(1) NOT NULL,
-  `down_url` varchar(200) DEFAULT NULL,
-  `DiskSerNo` varchar(50) DEFAULT NULL,
-  PRIMARY KEY (`exam_id`,`file_description`,`file_type`,`subject_code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+CREATE TABLE `upload_file_list`
+(
+    `exam_id`          int(11) NOT NULL,
+    `subject_code`     varchar(30)  NOT NULL,
+    `subject_name`     varchar(50)  DEFAULT NULL,
+    `is_used`          int(1) DEFAULT NULL,
+    `file_description` varchar(100) NOT NULL,
+    `file_type`        int(1) NOT NULL,
+    `down_url`         varchar(200) DEFAULT NULL,
+    `DiskSerNo`        varchar(50)  DEFAULT NULL,
+    `json_card`        longtext,
+    PRIMARY KEY (`exam_id`, `file_description`, `file_type`, `subject_code`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
 
 -- ----------------------------
 -- Table structure for verify_check_info
 -- ----------------------------
 DROP TABLE IF EXISTS `verify_check_info`;
-CREATE TABLE `verify_check_info` (
-  `exam_id` int(11) NOT NULL,
-  `campus_code` int(30) DEFAULT NULL,
-  `exam_number` varchar(30) NOT NULL,
-  `subject_code` varchar(30) DEFAULT NULL,
-  `exam_college` varchar(64) DEFAULT NULL,
-  `exam_site` varchar(50) DEFAULT NULL,
-  `slicePoint` longtext,
-  `misspage` varchar(30) DEFAULT NULL,
-  `sheet_src` longtext,
-  `check_times` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `check_ip1` varchar(30) DEFAULT NULL,
-  `check_status1` varchar(50) DEFAULT NULL,
-  `check_msg_history1` varchar(300) DEFAULT NULL,
-  `status_examine1` varchar(10) DEFAULT NULL,
-  `check_ip2` varchar(30) DEFAULT NULL,
-  `check_status2` varchar(50) DEFAULT NULL,
-  `check_msg_history2` varchar(300) DEFAULT NULL,
-  `status_examine2` varchar(10) DEFAULT NULL,
-  `check_ip3` varchar(30) DEFAULT NULL,
-  `check_status3` varchar(50) DEFAULT NULL,
-  `check_msg_history3` varchar(300) DEFAULT NULL,
-  `status_examine3` varchar(10) DEFAULT NULL,
-  `Remark` varchar(100) DEFAULT NULL,
-  PRIMARY KEY (`exam_id`,`exam_number`),
-  KEY `check_ip1` (`check_ip1`,`check_status1`,`check_msg_history1`),
-  KEY `check_ip2` (`check_ip2`,`check_status2`,`check_msg_history2`),
-  KEY `check_ip3` (`check_ip3`,`check_status3`,`check_msg_history3`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+CREATE TABLE `verify_check_info`
+(
+    `exam_id`            int(11) NOT NULL,
+    `campus_code`        int(30) DEFAULT NULL,
+    `exam_number`        varchar(30) NOT NULL,
+    `subject_code`       varchar(30)  DEFAULT NULL,
+    `exam_college`       varchar(64)  DEFAULT NULL,
+    `exam_site`          varchar(50)  DEFAULT NULL,
+    `slicePoint`         longtext,
+    `misspage`           varchar(30)  DEFAULT NULL,
+    `sheet_src`          longtext,
+    `check_times`        timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    `check_ip1`          varchar(30)  DEFAULT NULL,
+    `check_status1`      varchar(50)  DEFAULT NULL,
+    `check_msg_history1` varchar(300) DEFAULT NULL,
+    `status_examine1`    varchar(10)  DEFAULT NULL,
+    `check_ip2`          varchar(30)  DEFAULT NULL,
+    `check_status2`      varchar(50)  DEFAULT NULL,
+    `check_msg_history2` varchar(300) DEFAULT NULL,
+    `status_examine2`    varchar(10)  DEFAULT NULL,
+    `check_ip3`          varchar(30)  DEFAULT NULL,
+    `check_status3`      varchar(50)  DEFAULT NULL,
+    `check_msg_history3` varchar(300) DEFAULT NULL,
+    `status_examine3`    varchar(10)  DEFAULT NULL,
+    `Remark`             varchar(100) DEFAULT NULL,
+    PRIMARY KEY (`exam_id`, `exam_number`) USING BTREE,
+    KEY                  `check_ip1` (`check_ip1`,`check_status1`,`check_msg_history1`) USING BTREE,
+    KEY                  `check_ip2` (`check_ip2`,`check_status2`,`check_msg_history2`) USING BTREE,
+    KEY                  `check_ip3` (`check_ip3`,`check_status3`,`check_msg_history3`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;

+ 107 - 12
install/mysql/upgrade/1.3.15.sql

@@ -2,24 +2,119 @@
 
 USE `stmms_ft`;
 
-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 '是否未选做';
+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 '是否未选做';
 -- 更新选做题未选做数据
-update eb_selective_student set not_selective=1 where student_id 
+update stmms_ft.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 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 
+		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
 		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;
+
+
+

+ 104 - 8
install/mysql/upgrade/1.5.0.sql

@@ -1,17 +1,17 @@
 -- 1.5.0
 USE `stmms_ft`;
-INSERT INTO `b_sys_config` (`id`, `type`, `description`, `update_time`)
+INSERT INTO stmms_ft.`b_sys_config` (`id`, `type`, `description`, `update_time`)
 VALUES (4, 'STUDENT_SHEET_COUNT', null, '2021-08-09 15:38:58');
 
-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 '题目序号';
+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 '题目序号';
 
-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 '复核轮数';
+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 '复核轮数';
 
-DROP TABLE IF EXISTS `s_basic_subject_range`;
-CREATE TABLE `s_basic_subject_range`
+DROP TABLE IF EXISTS stmms_ft.`s_basic_subject_range`;
+CREATE TABLE stmms_ft.`s_basic_subject_range`
 (
     `id`                   int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
     `exam_id`              int(11)     DEFAULT NULL COMMENT '考试ID',
@@ -25,3 +25,99 @@ CREATE TABLE `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;
+
+
+

+ 135 - 39
install/mysql/upgrade/1.5.1.sql

@@ -1,77 +1,173 @@
 -- 1.5.1
 USE `stmms_ft`;
 
-ALTER TABLE m_trial_library DROP INDEX `index2`;
-ALTER TABLE m_trial_library ADD INDEX `index2` (`student_id`, `group_number`);
-ALTER TABLE eb_marker ADD COLUMN `finish_count_na` int(11)     DEFAULT NULL COMMENT '完成数量不含仲裁';
-ALTER TABLE eb_marker ADD COLUMN `valid_count_na`  int(11)     DEFAULT NULL COMMENT '有效数量不含仲裁';
-ALTER TABLE eb_marker ADD COLUMN `avg_score_na`    double      DEFAULT NULL COMMENT '平均分不含仲裁';
-ALTER TABLE eb_marker ADD COLUMN `avg_speed_na`    double      DEFAULT NULL COMMENT '平均时长不含仲裁';
-ALTER TABLE eb_marker ADD COLUMN `stdev_score_na`  double      DEFAULT NULL COMMENT '标准差不含仲裁';
+ALTER TABLE stmms_ft.m_trial_library DROP INDEX `index2`;
+ALTER TABLE stmms_ft.m_trial_library ADD INDEX `index2` (`student_id`, `group_number`);
+ALTER TABLE stmms_ft.eb_marker ADD COLUMN `finish_count_na` int(11)     DEFAULT NULL COMMENT '完成数量不含仲裁';
+ALTER TABLE stmms_ft.eb_marker ADD COLUMN `valid_count_na`  int(11)     DEFAULT NULL COMMENT '有效数量不含仲裁';
+ALTER TABLE stmms_ft.eb_marker ADD COLUMN `avg_score_na`    double      DEFAULT NULL COMMENT '平均分不含仲裁';
+ALTER TABLE stmms_ft.eb_marker ADD COLUMN `avg_speed_na`    double      DEFAULT NULL COMMENT '平均时长不含仲裁';
+ALTER TABLE stmms_ft.eb_marker ADD COLUMN `stdev_score_na`  double      DEFAULT NULL COMMENT '标准差不含仲裁';
 
-ALTER TABLE eb_exam_student ADD COLUMN `objective_page_count`   int(11)     NOT NULL DEFAULT 0 COMMENT '客观题图数量';
-ALTER TABLE eb_exam ADD COLUMN `inspect_round_limit`   	tinyint(1)  NOT NULL DEFAULT 1 COMMENT '全卷复核进度100%时才能再次复核';
+ALTER TABLE stmms_ft.eb_exam_student ADD COLUMN `objective_page_count`   int(11)     NOT NULL DEFAULT 0 COMMENT '客观题图数量';
+ALTER TABLE stmms_ft.eb_exam ADD COLUMN `inspect_round_limit`   	tinyint(1)  NOT NULL DEFAULT 1 COMMENT '全卷复核进度100%时才能再次复核';
 
-update b_privilege set seq=50 where code='exam_paper';
-update b_privilege set seq=40 where code='exam_scan';
+update stmms_ft.b_privilege set seq=50 where code='exam_paper';
+update stmms_ft.b_privilege set seq=40 where code='exam_scan';
 
 
-delete from b_privilege  where code in ('exam_report_subject','exam_report_subject_range');
-delete from b_role_privilege  where privilege_code in ('exam_report_subject','exam_report_subject_range');
-delete from b_role_privilege  where privilege_code in ('exam_mark-group-add','exam_mark-group-edit','exam_mark-group-reset_edit','exam_mark-group-delete');
+delete from stmms_ft.b_privilege  where code in ('exam_report_subject','exam_report_subject_range');
+delete from stmms_ft.b_role_privilege  where privilege_code in ('exam_report_subject','exam_report_subject_range');
+delete from stmms_ft.b_role_privilege  where privilege_code in ('exam_mark-group-add','exam_mark-group-edit','exam_mark-group-reset_edit','exam_mark-group-delete');
 
-INSERT INTO `b_privilege` ( `code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`,`level`,`icon`,`i18n`)
+INSERT INTO stmms_ft.`b_privilege` ( `code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`,`level`,`icon`,`i18n`)
 VALUES ('overview', '主页导览', 'root_code', 'MENU', '/admin/basic/overview', 5,1,'icon-bookmark','index.overview');
 
-INSERT INTO `b_privilege` ( `code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`,`level`,`icon`,`i18n`)
+INSERT INTO stmms_ft.`b_privilege` ( `code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`,`level`,`icon`,`i18n`)
 VALUES ('exam_report_subject', '科目分析', 'root_code', 'MENU', '/admin/basic/role/info/sub/page', 110,1,'icon-asterisk','index.report.subject');
-INSERT INTO `b_privilege` ( `code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`,`level`)
+INSERT INTO stmms_ft.`b_privilege` ( `code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`,`level`)
 VALUES ('exam_report_subject-total', '总量分析', 'exam_report_subject', 'PAGE', '/admin/exam/reportSubject', 10,2);
-INSERT INTO `b_privilege` ( `code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`,`level`)
+INSERT INTO stmms_ft.`b_privilege` ( `code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`,`level`)
 VALUES ('exam_report_subject-range', '分段统计', 'exam_report_subject', 'PAGE', '/admin/exam/reportSubjectRange', 20,2);
-INSERT INTO `b_privilege` ( `code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`,`level`)
+INSERT INTO stmms_ft.`b_privilege` ( `code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`,`level`)
 VALUES ('exam_report_subject-college', '学院分析', 'exam_report_subject', 'PAGE', '/admin/exam/reportSubjectCollege', 30,2);
-INSERT INTO `b_privilege` ( `code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`,`level`)
+INSERT INTO stmms_ft.`b_privilege` ( `code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`,`level`)
 VALUES ('exam_report_subject-teacher', '任课老师分析', 'exam_report_subject', 'PAGE', '/admin/exam/reportSubjectTeacher', 40,2);
-INSERT INTO `b_privilege` ( `code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`,`level`)
+INSERT INTO stmms_ft.`b_privilege` ( `code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`,`level`)
 VALUES ('exam_report_subject-class', '班级分析', 'exam_report_subject', 'PAGE', '/admin/exam/reportSubjectClass', 50,2);
-INSERT INTO `b_privilege` ( `code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`,`level`)
+INSERT INTO stmms_ft.`b_privilege` ( `code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`,`level`)
 VALUES ('exam_report_subject-objective_question', '客观题分析', 'exam_report_subject', 'PAGE', '/admin/exam/reportSubjectQuestion', 60,2);
-INSERT INTO `b_privilege` ( `code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`,`level`)
+INSERT INTO stmms_ft.`b_privilege` ( `code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`,`level`)
 VALUES ('exam_report_subject-subjective_question', '主观题分析', 'exam_report_subject', 'PAGE', '/admin/exam/reportSubjectQuestion', 70,2);
-INSERT INTO `b_privilege` ( `code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`,`level`)
+INSERT INTO stmms_ft.`b_privilege` ( `code`, `name`, `parent_code`, `privilege_type`, `privilege_uri`, `seq`,`level`)
 VALUES ('exam_report_subject-group', '大题分析', 'exam_report_subject', 'PAGE', '/admin/exam/reportSubjectGroup', 80,2);
 
-INSERT INTO b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)
-SELECT s.id,'SCHOOL_ADMIN',p.`code`,1 from b_privilege p join b_school s   
+INSERT INTO stmms_ft.b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)
+SELECT s.id,'SCHOOL_ADMIN',p.`code`,1 from stmms_ft.b_privilege p join stmms_ft.b_school s
 where p.`code` in('overview','exam_report_subject','exam_report_subject-total','exam_report_subject-range','exam_report_subject-college',
 'exam_report_subject-teacher','exam_report_subject-class'
 ,'exam_report_subject-objective_question','exam_report_subject-subjective_question','exam_report_subject-group');
 
-INSERT INTO b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)
-SELECT s.id,'SUBJECT_HEADER',p.`code`,1 from b_privilege p join b_school s   
+INSERT INTO stmms_ft.b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)
+SELECT s.id,'SUBJECT_HEADER',p.`code`,1 from stmms_ft.b_privilege p join stmms_ft.b_school s
 where p.`code` in('overview','exam_report_subject','exam_report_subject-total','exam_report_subject-range','exam_report_subject-college',
 'exam_report_subject-teacher','exam_report_subject-class'
 ,'exam_report_subject-objective_question','exam_report_subject-subjective_question','exam_report_subject-group');
 
-INSERT INTO b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)
-SELECT s.id,'COLLEGE_ADMIN',p.`code`,1 from b_privilege p join b_school s   
+INSERT INTO stmms_ft.b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)
+SELECT s.id,'COLLEGE_ADMIN',p.`code`,1 from stmms_ft.b_privilege p join stmms_ft.b_school s
 where p.`code` in('overview','exam_report_subject','exam_report_subject-total','exam_report_subject-range','exam_report_subject-college',
 'exam_report_subject-teacher','exam_report_subject-class'
 ,'exam_report_subject-objective_question','exam_report_subject-subjective_question','exam_report_subject-group');
 
-INSERT INTO b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)
-SELECT s.id,'SCHOOL_VIEWER',p.`code`,1 from b_privilege p join b_school s   
+INSERT INTO stmms_ft.b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)
+SELECT s.id,'SCHOOL_VIEWER',p.`code`,1 from stmms_ft.b_privilege p join stmms_ft.b_school s
 where p.`code` in('exam_report_subject','exam_report_subject-total');
 
-INSERT INTO b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)
-SELECT s.id,'SCHOOL_ADMIN',p.`code`,1 from b_privilege p join b_school s   
+INSERT INTO stmms_ft.b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)
+SELECT s.id,'SCHOOL_ADMIN',p.`code`,1 from stmms_ft.b_privilege p join stmms_ft.b_school s
 where p.`code` in('exam_mark-group-add','exam_mark-group-edit','exam_mark-group-reset_edit','exam_mark-group-delete');
 
-INSERT INTO b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)
-SELECT s.id,'SUBJECT_HEADER',p.`code`,0 from b_privilege p join b_school s   
+INSERT INTO stmms_ft.b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)
+SELECT s.id,'SUBJECT_HEADER',p.`code`,0 from stmms_ft.b_privilege p join stmms_ft.b_school s
 where p.`code` in('exam_mark-group-add','exam_mark-group-edit','exam_mark-group-reset_edit','exam_mark-group-delete');
 
-INSERT INTO b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)
-SELECT s.id,'COLLEGE_ADMIN',p.`code`,0 from b_privilege p join b_school s   
-where p.`code` in('exam_mark-group-add','exam_mark-group-edit','exam_mark-group-reset_edit','exam_mark-group-delete');
+INSERT INTO stmms_ft.b_role_privilege (`school_id`, `role_code`, `privilege_code`,`enable`)
+SELECT s.id,'COLLEGE_ADMIN',p.`code`,0 from stmms_ft.b_privilege p join stmms_ft.b_school s
+where p.`code` in('exam_mark-group-add','exam_mark-group-edit','exam_mark-group-reset_edit','exam_mark-group-delete');
+
+
+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;
+
+
+