fix bugs

stmms-web/src/main/java/cn/com/qmth/stmms/admin/thread/ScoreCalculateThread.java

@@ -1,5 +1,7 @@
 package cn.com.qmth.stmms.admin.thread;
 
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -143,6 +145,18 @@ public class ScoreCalculateThread implements Runnable {
             if (list == null) {
                 list = questionService.findByExamAndSubjectAndObjectiveAndPaperType(examId, subjectCode, true,
                         paperType);
+                Collections.sort(list, new Comparator<ExamQuestion>() {
+
+                    @Override
+                    public int compare(ExamQuestion o1, ExamQuestion o2) {
+                        int i = o1.getMainNumber() - o2.getMainNumber();
+                        if (i == 0) {
+                            return Integer.parseUnsignedInt(o1.getSubNumber())
+                                    - Integer.parseUnsignedInt(o2.getSubNumber());
+                        }
+                        return i;
+                    }
+                });
                 objectiveMap.put(key, list);
             }
             return list;

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

@@ -18,7 +18,7 @@
         <li><a href="${ctx}/admin/exam/arbitrate?subjectCode=${query.code}">仲裁管理</a></li>
         <li><a href="${ctx}/admin/exam/quality?subjectCode=${query.code}">质量监控</a></li>
     </ul>
-    	<div id="main" style="width: 800px;height:400px;"></div>
+    	<div id="main" style="width: 1000px;height:400px;"></div>
 	<form id="searchForm" action="${ctx}/admin/exam/mark" method="post" class="breadcrumb form-search">
 		<input type="hidden" id="pageNumber" name="pageNumber" value="${query.pageNumber }"/>
 		<input type="hidden" id="pageSize" name="pageSize" value="${query.pageSize }"/>
@@ -110,6 +110,15 @@ var unMarkedCount =${unMarkedCount};
 var finishCount =${finishCount};
 var unFinishCount =${unFinishCount};
 var myChart = echarts.init(document.getElementById('main'));
+var p1=100*unMarkedCount/(markedCount+unMarkedCount);
+var unMarkedCountTitle="任务待完成"+p1.toFixed(2)+"%";
+var p2= 100*markedCount/(markedCount+unMarkedCount);
+var markedCountTitle="任务已完成"+p2.toFixed(2)+"%";
+
+var p3=100*unFinishCount/(finishCount+unFinishCount);
+var unFinishCountTitle="科目待完成"+p3.toFixed(2)+"%";
+var p4= 100*finishCount/(finishCount+unFinishCount);
+var finishCountTitle="科目已完成"+p4.toFixed(2)+"%";
 myChart.setOption({
 	title: [{
         text: '阅卷总进度'
@@ -122,22 +131,22 @@ myChart.setOption({
 	    orient: "vertical",
 	    left: "left",
 	    top: "50px",
-	    data: ["任务待完成", "任务已完成",]
+	    data: [unMarkedCountTitle, markedCountTitle]
 	  },
 	  {
 		orient: "vertical",
 	    left: "50%",
 	    top: "50px",
-	    data: ["科目待完成", "科目已完成",]
+	    data: [unFinishCountTitle, finishCountTitle]
 	}],
     series : [
         {
         type: 'pie',
         radius: '55%',
-        center: ['20%', '50%'],
+        center: ['25%', '50%'],
         data:[
-              {value:unMarkedCount, name:'任务待完成'},
-  			{value:markedCount, name:'任务已完成'}
+              {value:unMarkedCount, name:unMarkedCountTitle},
+  			{value:markedCount, name:markedCountTitle}
            ],
         animation: false,
         label: {
@@ -148,10 +157,10 @@ myChart.setOption({
     }, {
         type: 'pie',
         radius: '55%',
-        center: ['80%', '50%'],
+        center: ['75%', '50%'],
         data:[
-            {value:unFinishCount, name:'科目待完成'},
-			{value:finishCount, name:'科目已完成'}
+            {value:unFinishCount, name:unFinishCountTitle},
+			{value:finishCount, name:finishCountTitle}
          ],
         animation: false,
         label: {