特殊标记增加下划线；仲裁页面增加评卷明细；更新初始化sql

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/model/ArbitrationDTO.java

@@ -12,10 +12,13 @@ public class ArbitrationDTO {
 
     private Double totalScore;
 
+    private String scoreList;
+
     public ArbitrationDTO(MarkLibrary library, Marker marker) {
         markerName = marker.getName();
         markTime = library.getMarkerTime();
         totalScore = library.getMarkerScore();
+        scoreList = library.getMarkerScoreList();
     }
 
     public String getMarkerName() {
@@ -41,4 +44,13 @@ public class ArbitrationDTO {
     public void setTotalScore(Double totalScore) {
         this.totalScore = totalScore;
     }
+
+    public String getScoreList() {
+        return scoreList;
+    }
+
+    public void setScoreList(String scoreList) {
+        this.scoreList = scoreList;
+    }
+
 }

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/ArbitrateController.java

@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import cn.com.qmth.stmms.biz.exam.model.ExamSubject;
 import cn.com.qmth.stmms.biz.exam.model.MarkGroup;
+import cn.com.qmth.stmms.biz.exam.service.ExamQuestionService;
 import cn.com.qmth.stmms.biz.exam.service.ExamSubjectService;
 import cn.com.qmth.stmms.biz.exam.service.MarkGroupService;
 import cn.com.qmth.stmms.biz.lock.LockService;
@@ -69,6 +70,9 @@ public class ArbitrateController extends BaseExamController {
 
     @Autowired
     private LockService lockService;
+    
+    @Autowired
+    private ExamQuestionService questionService;
 
     @Value("${slice.image.server}")
     private String sliceServer;
@@ -98,6 +102,10 @@ public class ArbitrateController extends BaseExamController {
         List<MarkGroup> groupList = groupService.findByExamAndSubjectWithDouble(examId, query.getSubjectCode());
         if (query.getGroupNumber() == null && groupList.size() > 0) {
             query.setGroupNumber(groupList.get(0).getNumber());
+            for (MarkGroup group : groupList) {
+                group.setQuestionList(questionService.findByExamAndSubjectAndObjectiveAndGroupNumber(examId,
+                        group.getSubjectCode(), false, group.getNumber()));
+            }
         }
         query.orderByIdDesc();
         query = arbitrateService.findByQuery(query);

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/LibraryController.java

@@ -4,6 +4,8 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
+import net.sf.json.JSONObject;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import cn.com.qmth.stmms.biz.exam.model.ExamSubject;
 import cn.com.qmth.stmms.biz.exam.model.MarkGroup;
+import cn.com.qmth.stmms.biz.exam.service.ExamQuestionService;
 import cn.com.qmth.stmms.biz.exam.service.MarkGroupService;
 import cn.com.qmth.stmms.biz.exam.service.MarkerService;
 import cn.com.qmth.stmms.biz.lock.LockService;
@@ -30,7 +33,6 @@ import cn.com.qmth.stmms.common.enums.LockType;
 import cn.com.qmth.stmms.common.enums.MarkStatus;
 import cn.com.qmth.stmms.common.enums.Role;
 import cn.com.qmth.stmms.common.utils.RequestUtils;
-import net.sf.json.JSONObject;
 
 @Controller("libraryController")
 @RequestMapping("/admin/exam/library")
@@ -53,6 +55,9 @@ public class LibraryController extends BaseExamController {
     @Autowired
     private LockService lockService;
 
+    @Autowired
+    private ExamQuestionService questionService;
+
     @RequestMapping
     public String list(Model model, HttpServletRequest request, MarkLibrarySearchQuery query,
             @RequestParam(required = false) LibraryStatus status) {
@@ -86,6 +91,10 @@ public class LibraryController extends BaseExamController {
                     library.setMarker(markerService.findById(library.getMarkerId()));
                 }
             }
+            for (MarkGroup group : groupList) {
+                group.setQuestionList(questionService.findByExamAndSubjectAndObjectiveAndGroupNumber(examId,
+                        group.getSubjectCode(), false, group.getNumber()));
+            }
         }
         model.addAttribute("query", query);
         model.addAttribute("subjectList", getExamSubject(examId, wu));

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/TrialController.java

@@ -20,6 +20,7 @@ import cn.com.qmth.stmms.biz.exam.model.ExamStudent;
 import cn.com.qmth.stmms.biz.exam.model.ExamSubject;
 import cn.com.qmth.stmms.biz.exam.model.MarkGroup;
 import cn.com.qmth.stmms.biz.exam.model.Marker;
+import cn.com.qmth.stmms.biz.exam.service.ExamQuestionService;
 import cn.com.qmth.stmms.biz.exam.service.ExamStudentService;
 import cn.com.qmth.stmms.biz.exam.service.MarkGroupService;
 import cn.com.qmth.stmms.biz.exam.service.MarkerService;
@@ -64,6 +65,9 @@ public class TrialController extends BaseExamController {
 
     @Autowired
     private LockService lockService;
+    
+    @Autowired
+    private ExamQuestionService questionService;
 
     @Value("${slice.image.server}")
     private String sliceServer;
@@ -93,6 +97,10 @@ public class TrialController extends BaseExamController {
             for (TrialLibrary library : query.getResult()) {
                 library.setMarkCount(trialService.countHistory(library.getId()));
             }
+            for (MarkGroup group : groupList) {
+                group.setQuestionList(questionService.findByExamAndSubjectAndObjectiveAndGroupNumber(examId,
+                        group.getSubjectCode(), false, group.getNumber()));
+            }
             model.addAttribute("group",
                     groupService.findOne(query.getExamId(), query.getSubjectCode(), query.getGroupNumber()));
         }

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

@@ -195,8 +195,11 @@ $(document).ready(function() {
     	initImagePopover($(this).attr('data-title'), '${packageServer}', $(this).attr('data-image-url'));
     	return false;
     });
-    
-    var timer = setInterval(function(){getExamProcess(timer)},5000);
+	var running = "${running}";
+	if(running=='true'){
+	    var timer = setInterval(function(){getExamProcess(timer)},5000);
+	}
+	
 });
 function page(n,s){
 	$("#pageNumber").val(n);
@@ -248,14 +251,18 @@ $('#subject-select').change(function(){
 });
 function getExamProcess(timer){
 	var running = "${running}";
-	if(running){
+	if(running=='true'){
 		$.post('${ctx}/admin/exam/score/getProcess', function(result){
 			if(result.running){
 				$("#exam-process").html("正在统分： "+result.process+"%");
+			}else{
+				window.clearInterval(timer);
+				window.location.reload();
 			}
 	    });
 	}else{
-		window.clearInterval(clock);
+		window.clearInterval(timer);
+		window.location.reload();
 	}
 	
 }

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

@@ -119,6 +119,10 @@ CREATE TABLE `eb_exam` (
   `creator_id` int(11) NOT NULL COMMENT '创建人',
   `create_time` datetime NOT NULL COMMENT '创建时间',
   `update_time` datetime DEFAULT NULL COMMENT '修改时间',
+  `excellent_score` double DEFAULT NULL COMMENT '优秀分',
+  `pass_score` double DEFAULT NULL COMMENT '及格分',
+  `need_calculate` tinyint(1) NOT NULL COMMENT '需要统分',
+  `process` double DEFAULT NULL COMMENT '统分进度',
   PRIMARY KEY (`id`),
   KEY `index1` (`school_id`,`create_time`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='考试表';
@@ -148,6 +152,7 @@ CREATE TABLE `eb_exam_question` (
   `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
   `exam_id` int(11) NOT NULL COMMENT '考试ID',
   `subject_code` varchar(32) NOT NULL DEFAULT '' COMMENT '科目代码',
+  `group_number` int(11) NOT NULL COMMENT '分组序号',
   `main_number` int(11) NOT NULL COMMENT '大题号',
   `sub_number` int(11) NOT NULL COMMENT '小题号',
   `is_objective` tinyint(1) NOT NULL COMMENT '是否客观题',
@@ -155,9 +160,7 @@ CREATE TABLE `eb_exam_question` (
   `answer` varchar(16) DEFAULT NULL COMMENT '正确答案',
   `total_score` double NOT NULL COMMENT '满分',
   `interval_score` double NOT NULL COMMENT '评卷间隔分',
-  `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 (`id`),
   KEY `index1` (`exam_id`,`subject_code`,`is_objective`,`main_number`,`sub_number`,`paper_type`)
@@ -257,8 +260,7 @@ DROP TABLE IF EXISTS `eb_mark_group`;
 CREATE TABLE `eb_mark_group` (
   `exam_id` int(11) NOT NULL COMMENT '考试ID',
   `subject_code` varchar(32) NOT NULL COMMENT '科目代码',
-  `number` int(11) NOT NULL COMMENT '大题号',
-  `title` varchar(128) NOT NULL COMMENT '名称',
+  `number` int(11) NOT NULL COMMENT '序号',
   `status` varchar(16) NOT NULL COMMENT '评卷状态',
   `pic_list` varchar(255) NOT NULL COMMENT '小图配置',
   `total_score` double NOT NULL COMMENT '满分',
@@ -301,6 +303,20 @@ CREATE TABLE `eb_marker` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='评卷员表';
 
 
+# Dump of table eb_marker_class
+# ------------------------------------------------------------
+
+DROP TABLE IF EXISTS `eb_marker_class`;
+
+CREATE TABLE `eb_marker_class` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `class_name` varchar(255) COLLATE utf8_bin DEFAULT NULL COMMENT '班级名称',
+  `marker_id` int(11) NOT NULL COMMENT '评卷员ID',
+  PRIMARY KEY (`id`),
+  KEY `index1` (`marker_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='评卷员班级表';
+
+
 # Dump of table m_arbitrate_history
 # ------------------------------------------------------------
 
@@ -374,7 +390,6 @@ CREATE TABLE `m_special_tag` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='特殊标记表';
 
 
-
 # Dump of table m_track
 # ------------------------------------------------------------
 
@@ -399,25 +414,6 @@ CREATE TABLE `m_track` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='轨迹给分表';
 
 
-# Dump of table s_score_rate
-# ------------------------------------------------------------
-
-DROP TABLE IF EXISTS `s_score_rate`;
-
-CREATE TABLE `s_score_rate` (
-  `exam_id` int(11) NOT NULL COMMENT '考试ID',
-  `campus_name` varchar(64) NOT NULL COMMENT '学习中心名称',
-  `subject_code` varchar(32) NOT NULL COMMENT '科目代码',
-  `main_number` int(11) NOT NULL COMMENT '大题题号',
-  `sub_number` int(11) NOT NULL COMMENT '小题号',
-  `is_objective` tinyint(1) NOT NULL COMMENT '是否客观题',
-  `main_title` varchar(64) DEFAULT NULL COMMENT '大题名称',
-  `total_score` double DEFAULT NULL COMMENT '总分',
-  `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
 # ------------------------------------------------------------
 
@@ -494,4 +490,202 @@ CREATE TABLE `m_trial_track` (
   KEY `index1` (`exam_id`,`subject_code`,`group_number`),
   KEY `index2` (`student_id`),
   KEY `index3` (`marker_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='试评轨迹表';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='试评轨迹表';
+
+
+# Dump of table s_basic_group
+# ------------------------------------------------------------
+
+DROP TABLE IF EXISTS `s_basic_group`;
+CREATE TABLE `s_basic_group` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `exam_id` int(11) DEFAULT NULL COMMENT '考试ID',
+  `subject_code` varchar(255) DEFAULT NULL COMMENT '科目代码',
+  `subject_name` varchar(255) DEFAULT NULL COMMENT '科目名称',
+  `objective` tinyint(1) DEFAULT NULL COMMENT '是否客观题',
+  `group_name` varchar(255) DEFAULT NULL COMMENT '大题名称',
+  `group_number` int(11) DEFAULT NULL COMMENT '大题号',
+  `max_score` double DEFAULT NULL COMMENT '最高分',
+  `min_score` double DEFAULT NULL COMMENT '最低分',
+  `avg_score` double DEFAULT NULL COMMENT '平均分',
+  `total_score` double DEFAULT NULL COMMENT '满分',
+  `stdev` double DEFAULT NULL COMMENT '标准差',
+  `coefficient` double DEFAULT NULL COMMENT '差异系数',
+  `score_rate` double DEFAULT NULL COMMENT '得分率',
+  `full_count` int(11) DEFAULT NULL COMMENT '满分人数',
+  `zero_count` int(11) DEFAULT NULL COMMENT '零分人数',
+  PRIMARY KEY (`id`),
+  KEY `index1` (`exam_id`,`subject_code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='大题统计表';
+
+
+# Dump of table s_basic_question
+# ------------------------------------------------------------
+
+DROP TABLE IF EXISTS `s_basic_question`;
+CREATE TABLE `s_basic_question` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `exam_id` int(11) DEFAULT NULL COMMENT '考试ID',
+  `subject_code` varchar(255) DEFAULT NULL COMMENT '科目代码',
+  `subject_name` varchar(255) DEFAULT NULL COMMENT '科目名称',
+  `objective` tinyint(1) DEFAULT NULL COMMENT '是否客观题',
+  `question_name` varchar(128) DEFAULT NULL COMMENT '题目名称',
+  `paper_type` varchar(32) DEFAULT NULL COMMENT '试卷类型',
+  `main_number` int(11) NOT NULL COMMENT '大题号',
+  `sub_number` int(11) NOT NULL COMMENT '小题号',
+  `avg_score` double DEFAULT NULL COMMENT '平均分',
+  `total_score` double DEFAULT NULL COMMENT '满分',
+  `stdev` double DEFAULT NULL COMMENT '标准差',
+  `score_rate` double DEFAULT NULL COMMENT '得分率',
+  `full_score_rate` double DEFAULT NULL COMMENT '满分率',
+  PRIMARY KEY (`id`),
+  KEY `index1` (`exam_id`,`subject_code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='小题统计表';
+
+
+# Dump of table s_basic_subject
+# ------------------------------------------------------------
+
+DROP TABLE IF EXISTS `s_basic_subject`;
+CREATE TABLE `s_basic_subject` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `exam_id` int(11) DEFAULT NULL COMMENT '考试ID',
+  `subject_code` varchar(255) DEFAULT NULL COMMENT '科目代码',
+  `subject_name` varchar(255) DEFAULT NULL COMMENT '科目名称',
+  `absent_count` int(11) DEFAULT NULL COMMENT '缺考人数',
+  `breach_count` int(11) DEFAULT NULL COMMENT '违纪人数',
+  `pass_count` int(11) DEFAULT NULL COMMENT '及格人数',
+  `pass_rate` double DEFAULT NULL COMMENT '及格率',
+  `reality_count` int(11) DEFAULT NULL COMMENT '实考人数',
+  `max_score` double DEFAULT NULL COMMENT '最高分',
+  `min_score` double DEFAULT NULL COMMENT '最低分',
+  `avg_score` double DEFAULT NULL COMMENT '平均分',
+  `total_count` int(11) DEFAULT NULL COMMENT '总人数',
+  PRIMARY KEY (`id`),
+  KEY `index1` (`exam_id`,`subject_code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='科目统计表';
+
+
+# Dump of table s_basic_subject_class
+# ------------------------------------------------------------
+
+DROP TABLE IF EXISTS `s_basic_subject_class`;
+CREATE TABLE `s_basic_subject_class` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `exam_id` int(11) DEFAULT NULL COMMENT '考试ID',
+  `subject_code` varchar(255) DEFAULT NULL COMMENT '科目代码',
+  `subject_name` varchar(255) DEFAULT NULL COMMENT '科目名称',
+  `class_name` varchar(255) DEFAULT NULL COMMENT '班级名称',
+  `excellent_count` int(11) DEFAULT NULL COMMENT '优秀人数',
+  `excellent_rate` double DEFAULT NULL  COMMENT '优秀率',
+  `pass_count` int(11) DEFAULT NULL COMMENT '及格人数',
+  `pass_rate` double DEFAULT NULL COMMENT '及格率',
+  `max_score` double DEFAULT NULL COMMENT '最高分',
+  `min_score` double DEFAULT NULL COMMENT '最低分',
+  `avg_score` double DEFAULT NULL COMMENT '平均分',
+  PRIMARY KEY (`id`),
+  KEY `index1` (`exam_id`,`subject_code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='班级统计表';
+
+
+# Dump of table s_basic_subject_college
+# ------------------------------------------------------------
+
+DROP TABLE IF EXISTS `s_basic_subject_college`;
+CREATE TABLE `s_basic_subject_college` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `exam_id` int(11) DEFAULT NULL COMMENT '考试ID',
+  `subject_code` varchar(255) DEFAULT NULL COMMENT '科目代码',
+  `subject_name` varchar(255) DEFAULT NULL COMMENT '科目名称',
+  `college_name` varchar(255) DEFAULT NULL COMMENT '学院名称',
+  `excellent_count` int(11) DEFAULT NULL COMMENT '优秀人数',
+  `excellent_rate` double DEFAULT NULL COMMENT '优秀率',
+  `pass_count` int(11) DEFAULT NULL COMMENT '及格人数',
+  `pass_rate` double DEFAULT NULL COMMENT '及格率',
+  `max_score` double DEFAULT NULL COMMENT '最高分',
+  `min_score` double DEFAULT NULL COMMENT '最低分',
+  `avg_score` double DEFAULT NULL COMMENT '平均分',
+  PRIMARY KEY (`id`),
+  KEY `index1` (`exam_id`,`subject_code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='学院统计表';
+
+
+# Dump of table s_basic_subject_teacher
+# ------------------------------------------------------------
+
+DROP TABLE IF EXISTS `s_basic_subject_teacher`;
+CREATE TABLE `s_basic_subject_teacher` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `exam_id` int(11) DEFAULT NULL COMMENT '考试ID',
+  `subject_code` varchar(255) DEFAULT NULL COMMENT '科目代码',
+  `subject_name` varchar(255) DEFAULT NULL COMMENT '科目名称',
+  `teacher_name` varchar(255) DEFAULT NULL COMMENT '任课老师',
+  `excellent_count` int(11) DEFAULT NULL COMMENT '优秀人数',
+  `excellent_rate` double DEFAULT NULL COMMENT '优秀率',
+  `pass_count` int(11) DEFAULT NULL COMMENT '及格人数',
+  `pass_rate` double DEFAULT NULL COMMENT '及格率',
+  `max_score` double DEFAULT NULL COMMENT '最高分',
+  `min_score` double DEFAULT NULL COMMENT '最低分',
+  `avg_score` double DEFAULT NULL COMMENT '平均分',
+  `reality_count` int(11) DEFAULT NULL COMMENT '实考人数',
+  `relative_avg_score` double DEFAULT NULL COMMENT '平均相对分',
+  PRIMARY KEY (`id`),
+  KEY `index1` (`exam_id`,`subject_code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='任课老师统计表';
+
+
+# Dump of table s_basic_subject_teacher_class
+# ------------------------------------------------------------
+
+DROP TABLE IF EXISTS `s_basic_subject_teacher_class`;
+CREATE TABLE `s_basic_subject_teacher_class` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `exam_id` int(11) DEFAULT NULL COMMENT '考试ID',
+  `subject_code` varchar(255) DEFAULT NULL COMMENT '科目代码',
+  `subject_name` varchar(255) DEFAULT NULL COMMENT '科目名称',
+  `teacher_name` varchar(255) DEFAULT NULL COMMENT '任课老师',
+  `class_name` varchar(255) DEFAULT NULL COMMENT '班级名称',
+  `excellent_count` int(11) DEFAULT NULL COMMENT '优秀人数',
+  `excellent_rate` double DEFAULT NULL COMMENT '优秀率',
+  `pass_count` int(11) DEFAULT NULL COMMENT '及格人数',
+  `pass_rate` double DEFAULT NULL COMMENT '及格率',
+  `max_score` double DEFAULT NULL COMMENT '最高分',
+  `min_score` double DEFAULT NULL COMMENT '最低分',
+  `avg_score` double DEFAULT NULL COMMENT '平均分',
+  `reality_count` int(11) DEFAULT NULL COMMENT '实考人数',
+  `relative_avg_score` double DEFAULT NULL COMMENT '平均相对分',
+  PRIMARY KEY (`id`),
+  KEY `index1` (`exam_id`,`subject_code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='任课老师班级统计表';
+
+
+# Dump of table s_range_subject
+# ------------------------------------------------------------
+
+DROP TABLE IF EXISTS `s_range_subject`;
+CREATE TABLE `s_range_subject` (
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `exam_id` int(11) DEFAULT NULL COMMENT '考试ID',
+  `subject_code` varchar(255) DEFAULT NULL COMMENT '科目代码',
+  `subject_name` varchar(255) DEFAULT NULL COMMENT '科目名称',
+  `subject_level` varchar(255) DEFAULT NULL COMMENT '科目层次',
+  `totalCount` int(11) DEFAULT NULL COMMENT '总人数',
+  `count0_49` int(11) DEFAULT NULL COMMENT '0-49',
+  `count50_59` int(11) DEFAULT NULL COMMENT '50-59',
+  `count60_69` int(11) DEFAULT NULL COMMENT '60-69',
+  `count70_79` int(11) DEFAULT NULL COMMENT '70-79',
+  `count80_89` int(11) DEFAULT NULL COMMENT '80-89',
+  `count90_100` int(11) DEFAULT NULL COMMENT '90-100',
+  `lt60` int(11) DEFAULT NULL COMMENT '<60',
+  `mte60` int(11) DEFAULT NULL COMMENT '>=60',
+  `percent0_49` double NOT NULL COMMENT '0-49占比',
+  `percent50_59` double NOT NULL COMMENT '50-59占比',
+  `percent60_69` double NOT NULL COMMENT '60-69占比',
+  `percent70_79` double NOT NULL COMMENT '70-79占比',
+  `percent80_89` double NOT NULL COMMENT '80-89占比',
+  `percent90_100` double NOT NULL COMMENT '90-100占比',
+  `percent_lt60` double NOT NULL COMMENT '<60占比',
+  `percent_mte60` double NOT NULL COMMENT '>=60占比',
+  PRIMARY KEY (`id`),
+  KEY `index1` (`exam_id`,`subject_code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='分段统计表';

stmms-web/src/main/webapp/static/mark-new/css/style.css

@@ -1402,4 +1402,21 @@ a.button.all-zero-button {
 }
 .c-table .loding tr:hover td {
 	background: none;
+}
+
+td.info {
+	position:relative;
+	padding: 4px 10px; 
+	text-align: center; 
+}
+td.info .jiao {
+	position: absolute;
+	top: -5px;
+	left: 45%;
+	width: 8px;
+	height: 5px;
+	background: url(../images/jiao.png) no-repeat 0 0;
+}
+tr:hover .jiao {
+	background: url(../images/jiao_hover.png) no-repeat 0 0;
 }

stmms-web/src/main/webapp/static/mark-new/js/modules/arbitration-process.js

@@ -45,6 +45,7 @@ ArbitrationProcess.prototype.render = function(task) {
             date.setTime(history.markTime);
             row.find('.history-time').html(date.format('hh:mm:ss'));
             row.find('.history-score').html(history.totalScore);
+            row.find('.history-scoreList').html('详情：'+history.scoreList+'<span class="jiao"></span>');
     	}
     }
 	this.markControl.trigger('mark.sidebar.open');
@@ -59,4 +60,5 @@ ArbitrationProcess.prototype.history_list_dom = '<div class="sublist"><table cla
 <tbody id="history-list"></tbody></table></div>';
 
 ArbitrationProcess.prototype.history_row_dom = '<tr><td class="history-name"></td>\
-<td class="history-time"></td><td class="history-score"></td></tr>';
+<td class="history-time"></td><td class="history-score"></tr>\
+<tr><td class="info history-scoreList" colspan="3"> </td></tr>';

stmms-web/src/main/webapp/static/mark-new/js/modules/specialTag.js

@@ -148,7 +148,8 @@ SpecialTag.prototype.container_content_dom = '<div class="content popover-conten
 <p id="problem-list" class="popover-list buttonCss">\
     <a href="#" value="√">√</a>\
     <a href="#" value="X">×</a>\
-    <a href="#" value="乄">乄</a></p>\
+    <a href="#" value="乄">乄</a>\
+	<a href="#" value="___" ><u>下划线</u></a></p>\
 <p><a href="#" id="undo-button" style="margin-left: 20px;">回&nbsp;&nbsp;&nbsp;退</a>\
 <a href="#" id="clear-button">全部清除</a></p></div>';