给分曲线修复；更新原始sql

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/qualityChart.jsp

@@ -55,10 +55,11 @@ $.post('${ctx}/admin/exam/quality/getChart', {subjectCode: subjectCode,groupNumb
 	for(var i=0;i<result.length;i++){
         var marker = result[i];
         var scorePercents= [];
-		var percent = marker.scorePercent;
-		console.log(percent);
+		
 		for(var j=minScore;j<= maxScore;j++){
-        	if(percent==null){
+        	var key=j+".0";
+			var percent = marker.scorePercent[key];
+        	if(percent==undefined){
         		scorePercents.push(0);
         	}else{
         		scorePercents.push(percent);
@@ -73,39 +74,36 @@ $.post('${ctx}/admin/exam/quality/getChart', {subjectCode: subjectCode,groupNumb
         markerArray.push(option);
         nameList.push(marker.loginName);
     }
+	var myChart = echarts.init(document.getElementById('main'));
+	option = {
+		    tooltip : {
+		        trigger: 'axis'
+		    },
+		    legend: {
+		        data:nameList
+		    },
+		    toolbox: {
+		        show : true
+		    },
+		    calculable : true,
+		    xAxis : [
+		        {
+		            type : 'category',
+		            boundaryGap : false,
+		            data : scoreArray
+		        }
+		    ],
+		    yAxis : [
+		        {
+		            type : 'value'
+		        }
+		    ],
+		    series : markerArray
+		    
+		};
+	myChart.setOption(option);
 });
 
-console.log(markerArray);
-console.log(nameList);
-console.log(scoreArray);
-var myChart = echarts.init(document.getElementById('main'));
-option = {
-	    tooltip : {
-	        trigger: 'axis'
-	    },
-	    legend: {
-	        data:nameList
-	    },
-	    toolbox: {
-	        show : true
-	    },
-	    calculable : true,
-	    xAxis : [
-	        {
-	            type : 'category',
-	            boundaryGap : false,
-	            data : scoreArray
-	        }
-	    ],
-	    yAxis : [
-	        {
-	            type : 'value'
-	        }
-	    ],
-	    series : markerArray
-	    
-	};
-myChart.setOption(option);
 </script>	
 </body>
 </html>

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

@@ -157,6 +157,7 @@ CREATE TABLE `eb_exam_question` (
   `full_count` int(11) DEFAULT NULL COMMENT '满分人数',
   `total_count` int(11) DEFAULT NULL COMMENT '总人数',
   `zero_count` int(11) DEFAULT NULL COMMENT '零分人数',
+  `paper_type` varchar(32) DEFAULT NULL COMMENT '试卷类型',
   PRIMARY KEY (`exam_id`,`subject_code`,`is_objective`,`main_number`,`sub_number`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='小题信息表';
 
@@ -197,6 +198,10 @@ CREATE TABLE `eb_exam_student` (
   `subjective_score_list` text COMMENT '主观得分明细',
   `subject_level` varchar(64) DEFAULT NULL COMMENT '层次',
   `subject_category` varchar(64) DEFAULT NULL COMMENT '专业类型',
+  `paper_type` varchar(32) DEFAULT NULL COMMENT '试卷类型',
+  `college` varchar(64) DEFAULT NULL COMMENT '学院',
+  `class_name` varchar(64) DEFAULT NULL COMMENT '班级',
+  `teacher` varchar(64) DEFAULT NULL COMMENT '任课老师',
   PRIMARY KEY (`id`),
   UNIQUE KEY `index1` (`exam_id`,`exam_number`),
   KEY `index2` (`exam_id`,`student_code`),
@@ -253,12 +258,15 @@ CREATE TABLE `eb_mark_group` (
   `subject_code` varchar(32) NOT NULL COMMENT '科目代码',
   `number` int(11) NOT NULL COMMENT '大题号',
   `title` varchar(128) NOT NULL COMMENT '名称',
+  `status` varchar(16) NOT NULL COMMENT '评卷状态',
   `pic_list` varchar(255) NOT NULL COMMENT '小图配置',
   `total_score` double NOT NULL COMMENT '满分',
+  `trial_count` int(11) DEFAULT NULL COMMENT '试评数量',
   `double_rate` double DEFAULT NULL COMMENT '双评比例',
   `arbitrate_threshold` double DEFAULT NULL COMMENT '仲裁阈值',
   `score_policy` varchar(16) DEFAULT NULL COMMENT '合分策略',
   `mark_mode` varchar(16) DEFAULT NULL COMMENT '强制评卷模式',
+  `sheet_view` tinyint(1) NOT NULL COMMENT '是否允许查看原卷',
   `build_time` datetime DEFAULT NULL COMMENT '最后生成任务时间',
   `library_count` int(11) NOT NULL COMMENT '任务总量',
   `marked_count` int(11) NOT NULL COMMENT '已评数量',
@@ -341,6 +349,7 @@ CREATE TABLE `m_library` (
   `header_score` double DEFAULT NULL COMMENT '科组长总分',
   `header_score_list` varchar(255) DEFAULT NULL COMMENT '科组长给分明细',
   `header_time` datetime DEFAULT NULL COMMENT '科组长评卷时间',
+  `marker_spent` int(11) DEFAULT NULL COMMENT '最新评卷时间',
   PRIMARY KEY (`id`),
   KEY `index1` (`exam_id`,`subject_code`,`group_number`,`status`),
   UNIQUE KEY `index2` (`student_id`,`group_number`,`task_number`),
@@ -406,3 +415,83 @@ CREATE TABLE `s_score_rate` (
   `avg_score` double DEFAULT NULL COMMENT '平均分',
   PRIMARY KEY (`exam_id`,`campus_name`,`subject_code`,`main_number`,`sub_number`,`is_objective`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='得分统计表';
+
+
+# Dump of table m_trial_history
+# ------------------------------------------------------------
+
+DROP TABLE IF EXISTS `m_trial_history`;
+CREATE TABLE `m_trial_history` (
+  `library_id` int(11) NOT NULL COMMENT '评卷任务ID',
+  `marker_id` int(11) NOT NULL COMMENT '评卷员ID',
+  `exam_id` int(11) NOT NULL COMMENT '考试ID',
+  `subject_code` varchar(32) NOT NULL COMMENT '科目代码',
+  `group_number` int(11) NOT NULL COMMENT '大题号',
+  `student_id` int(11) NOT NULL COMMENT '考生ID',
+  `marker_score` double NOT NULL COMMENT '评卷总分',
+  `marker_score_list` varchar(255) NOT NULL COMMENT '评卷总分明细',
+  `marker_time` datetime NOT NULL COMMENT '评卷时间',
+  PRIMARY KEY (`library_id`,`marker_id`),
+  KEY `index1` (`exam_id`,`subject_code`,`group_number`),
+  KEY `index2` (`student_id`),
+  KEY `index3` (`marker_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='试评记录表';
+
+
+# Dump of table m_trial_library
+# ------------------------------------------------------------
+
+DROP TABLE IF EXISTS `m_trial_library`;
+CREATE TABLE `m_trial_library` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `exam_id` int(11) NOT NULL COMMENT '考试ID',
+  `subject_code` varchar(32) NOT NULL COMMENT '科目代码',
+  `group_number` int(11) NOT NULL COMMENT '大题号',
+  `campus_id` int(11) NOT NULL COMMENT '学习中心ID',
+  `student_id` int(11) NOT NULL COMMENT '考生ID',
+  `exam_number` varchar(64) NOT NULL COMMENT '准考证号',
+  `mark_count` int(11) NOT NULL COMMENT '已评人数',
+  PRIMARY KEY (`id`),
+  KEY `index1` (`exam_id`,`subject_code`,`group_number`),
+  KEY `index2` (`student_id`,`group_number`)
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COMMENT='试评任务表';
+
+
+# Dump of table m_trial_tag
+# ------------------------------------------------------------
+
+DROP TABLE IF EXISTS `m_trial_tag`;
+CREATE TABLE `m_trial_tag` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `library_id` int(11) NOT NULL COMMENT '评卷任务ID',
+  `marker_id` int(11) NOT NULL COMMENT '评卷员ID',
+  `content` varchar(16) NOT NULL COMMENT '标记内容',
+  `position_x` double NOT NULL COMMENT 'X轴位置',
+  `position_y` double NOT NULL COMMENT 'Y轴位置',
+  PRIMARY KEY (`id`),
+  KEY `index1` (`library_id`,`marker_id`),
+  KEY `index2` (`marker_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COMMENT='试评特殊标记表';
+
+
+# Dump of table m_trial_track
+# ------------------------------------------------------------
+
+DROP TABLE IF EXISTS `m_trial_track`;
+CREATE TABLE `m_trial_track` (
+  `library_id` int(11) NOT NULL COMMENT '评卷任务ID',
+  `marker_id` int(11) NOT NULL COMMENT '评卷员ID',
+  `question_number` varchar(32) NOT NULL COMMENT '完整题号',
+  `number` int(11) NOT NULL COMMENT '序号',
+  `exam_id` int(11) NOT NULL COMMENT '考试ID',
+  `subject_code` varchar(255) NOT NULL COMMENT '科目代码',
+  `group_number` int(11) NOT NULL COMMENT '大题题号',
+  `student_id` int(11) NOT NULL COMMENT '考生ID',
+  `score` double NOT NULL COMMENT '给分',
+  `position_x` double NOT NULL COMMENT 'X轴位置',
+  `position_y` double NOT NULL COMMENT 'Y轴位置',
+  PRIMARY KEY (`library_id`,`marker_id`,`number`,`question_number`),
+  KEY `index1` (`exam_id`,`subject_code`,`group_number`),
+  KEY `index2` (`student_id`),
+  KEY `index3` (`marker_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='试评轨迹表';