Merge remote-tracking branch 'origin/dev_xuwenjin' into dev_xuwenjin

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/model/ExamQuestion.java

@@ -57,18 +57,6 @@ public class ExamQuestion implements Serializable {
     @Column(name = "total_count", nullable = true)
     private Integer totalCount;
 
-    /**
-     * 零分人数
-     */
-    @Column(name = "zero_count", nullable = true)
-    private Integer zeroCount;
-
-    /**
-     * 满分人数
-     */
-    @Column(name = "full_count", nullable = true)
-    private Integer fullCount;
-
     @Transient
     private ExamSubject subject;
 
@@ -206,22 +194,6 @@ public class ExamQuestion implements Serializable {
         this.intervalScore = intervalScore;
     }
 
-    public Integer getZeroCount() {
-        return zeroCount;
-    }
-
-    public void setZeroCount(Integer zeroCount) {
-        this.zeroCount = zeroCount;
-    }
-
-    public Integer getFullCount() {
-        return fullCount;
-    }
-
-    public void setFullCount(Integer fullCount) {
-        this.fullCount = fullCount;
-    }
-
     public Integer getTotalCount() {
         return totalCount;
     }

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

@@ -1,7 +1,5 @@
 package cn.com.qmth.stmms.admin.dto;
 
-import java.text.DecimalFormat;
-
 import cn.com.qmth.stmms.biz.exam.model.ExamQuestion;
 import cn.com.qmth.stmms.biz.exam.model.ExamSubject;
 import cn.com.qmth.stmms.common.annotation.ExcelField;
@@ -23,16 +21,12 @@ public class ExceptionQuestionDTO {
     @ExcelField(title = "小题号", align = 2, sort = 50)
     private Integer subNumber;
 
-    @ExcelField(title = "零分比例", align = 2, sort = 60)
-    private String zeroRate;
-
     public ExceptionQuestionDTO(ExamQuestion question, ExamSubject subject) {
         setSubjectCode(question.getSubjectCode());
         setSubjectName(subject.getName());
         setMainTitle(question.getMainTitle());
         setMainNumber(question.getMainNumber());
         setSubNumber(question.getSubNumber());
-        setZeroRate(new DecimalFormat("##%").format(question.getZeroCount() * 1.0 / question.getTotalCount()));
     }
 
     public String getSubjectCode() {
@@ -74,12 +68,4 @@ public class ExceptionQuestionDTO {
     public void setSubNumber(Integer subNumber) {
         this.subNumber = subNumber;
     }
-
-    public String getZeroRate() {
-        return zeroRate;
-    }
-
-    public void setZeroRate(String zeroRate) {
-        this.zeroRate = zeroRate;
-    }
 }

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

@@ -81,8 +81,6 @@ public class SubjectiveQuestionDTO implements QuestionDTO {
         question.setTotalScore(totalScore);
         question.setIntervalScore(intervalScore != null && intervalScore > 0 ? intervalScore : 1d);
         question.setTotalCount(0);
-        question.setZeroCount(0);
-        question.setFullCount(0);
         question.setPicList(picList);
         question.setDoubleRate(doubleRate);
         question.setArbitrateThreshold(arbitrateThreshold);

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

@@ -234,7 +234,7 @@ function save(){
             array.push(q.answer);
         }
     }
-    $.post('${ctx}/admin/exam/check/student/save', {
+    $.post('${ctx}/admin/exam/check/answer/save', {
         studentId: student.id,
         absent: student.absent,
         answers: array.join(',')