Merge remote-tracking branch 'origin/stmms_ft_dev' into test_20181225

stmms-web/src/main/webapp/sql/stmms_ft.sql

@@ -174,7 +174,7 @@ CREATE TABLE `eb_exam_student` (
   `subject_code` varchar(32) NOT NULL COMMENT '科目代码',
   `subject_name` varchar(32) NOT NULL COMMENT '科目名称',
   `exam_number` varchar(64) NOT NULL COMMENT '准考证号',
-  `student_code` varchar(64) NOT COMMENT '学号',
+  `student_code` varchar(64) NOT NULL COMMENT '学号',
   `name` varchar(32) NOT NULL COMMENT '姓名',
   `package_code` varchar(128) DEFAULT NULL COMMENT '试卷袋编号',
   `exam_site` varchar(64) DEFAULT NULL COMMENT '考点',
@@ -310,7 +310,7 @@ CREATE TABLE `m_arbitrate_history` (
   `update_time` datetime DEFAULT NULL COMMENT '处理时间',
   PRIMARY KEY (`id`),
   KEY `index1` (`exam_id`,`subject_code`,`group_number`,`status`),
-  KEY `index2` (`user_id`,`status`,`update_time`)
+  KEY `index2` (`user_id`,`status`,`update_time`),
   KEY `index3` (`student_id`,`status`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='仲裁记录表';
 
@@ -370,7 +370,7 @@ DROP TABLE IF EXISTS `m_track`;
 
 CREATE TABLE `m_track` (
   `library_id` int(11) NOT NULL COMMENT '评卷任务ID',
-  `question_number` varchar(128) CHARACTER NOT NULL COMMENT '完整题号',
+  `question_number` varchar(128) NOT NULL COMMENT '完整题号',
   `number` int(11) NOT NULL COMMENT '序号',
   `student_id` int(11) NOT NULL COMMENT '考生ID',
   `exam_id` int(11) NOT NULL COMMENT '考试ID',
@@ -383,7 +383,7 @@ CREATE TABLE `m_track` (
   PRIMARY KEY (`library_id`,`question_number`,`number`),
   KEY `index1` (`student_id`,`group_number`),
   KEY `index2` (`marker_id`),
-  KEY `index3` (`exam_id`,`subject_code`,`group_number`),
+  KEY `index3` (`exam_id`,`subject_code`,`group_number`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='轨迹给分表';