修复无试卷类型导入问题及给分曲线显示

stmms-web/src/main/java/cn/com/qmth/stmms/admin/dto/ObjectiveQuestionDTO.java

@@ -50,7 +50,9 @@ public class ObjectiveQuestionDTO implements QuestionDTO {
     public ExamQuestion transform() {
         ExamQuestion question = new ExamQuestion();
         question.setSubjectCode(StringUtils.trimToNull(subjectCode));
-        question.setPaperType(StringUtils.trimToNull(paperType).toUpperCase());
+        if(StringUtils.trimToNull(paperType)!=null){
+        	question.setPaperType(StringUtils.trimToNull(paperType).toUpperCase());
+        }
         question.setMainNumber(mainNumber);
         question.setSubNumber(subNumber);
         question.setObjective(true);
@@ -59,8 +61,6 @@ public class ObjectiveQuestionDTO implements QuestionDTO {
         question.setTotalScore(totalScore);
         question.setIntervalScore(1d);
         question.setTotalCount(0);
-        question.setZeroCount(0);
-        question.setFullCount(0);
         return question;
     }
 

stmms-web/src/main/java/cn/com/qmth/stmms/api/controller/ScanController.java

@@ -2,6 +2,7 @@ package cn.com.qmth.stmms.api.controller;
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -70,7 +71,9 @@ public class ScanController extends BaseApiController {
                     student.setBatchCode(sc.getBatchCode());
                     student.setSliceCount(sc.getSliceCount());
                     student.setSheetCount(sc.getSheetCount());
-                    student.setPaperType(sc.getPaperType().toUpperCase());
+                    if(StringUtils.trimToNull(sc.getPaperType())!=null){
+                    	student.setPaperType(StringUtils.trimToNull(sc.getPaperType()).toUpperCase());
+                    }
                     // 同步更新评卷任务
                     if (saveUploadStudent(student)) {
                         JSONObject obj = new JSONObject();

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

@@ -14,7 +14,7 @@
         <li><a href="${ctx}/admin/exam/quality?subjectCode=${subject.code}">返回</a></li>
     </ul>
 	<tags:message content="${message}"/>
-	<div id="main" style="width: 800px;height:300px;"></div>
+	<div id="main" style="width: 800px;height:400px;"></div>
 	<table id="contentTable" class="table table-striped table-bordered table-condensed">
 		<thead>
 			<tr>
@@ -81,6 +81,7 @@ $.post('${ctx}/admin/exam/quality/getChart', {subjectCode: subjectCode,groupNumb
 		        trigger: 'axis'
 		    },
 		    legend: {
+		        x: 100, 
 		        data:nameList
 		    },
 		    toolbox: {