fix

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/bean/ExamStudentVo.java

@@ -16,9 +16,7 @@ import org.springframework.beans.BeanUtils;
 
 import cn.com.qmth.stmms.biz.exam.model.ExamQuestion;
 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.InspectHistory;
-import cn.com.qmth.stmms.biz.mark.model.ProblemType;
 import cn.com.qmth.stmms.biz.utils.ScoreItem;
 import cn.com.qmth.stmms.common.annotation.ExcelField;
 import cn.com.qmth.stmms.common.enums.SubjectiveStatus;
@@ -254,8 +252,6 @@ public class ExamStudentVo {
      */
     private String subjectRemark;
 
-    private ExamSubject subject;
-
     private List<String> sheetUrls;
 
     private List<String> packageUrls;
@@ -280,8 +276,6 @@ public class ExamStudentVo {
 
     private List<ExamQuestion> objectiveQuestionList;
 
-    private ProblemType problemType;
-
     private String problemUserName;
 
     private String problemRestTime;
@@ -649,13 +643,6 @@ public class ExamStudentVo {
         this.libraryId = libraryId;
     }
 
-    public ExamSubject getSubject() {
-        return subject;
-    }
-
-    public void setSubject(ExamSubject subject) {
-        this.subject = subject;
-    }
 
     public boolean isBreach() {
         return breach;
@@ -753,13 +740,6 @@ public class ExamStudentVo {
         this.objectiveQuestionList = objectiveQuestionList;
     }
 
-    public ProblemType getProblemType() {
-        return problemType;
-    }
-
-    public void setProblemType(ProblemType problemType) {
-        this.problemType = problemType;
-    }
 
     public SubjectiveStatus getSubjectiveStatus() {
         return subjectiveStatus;
@@ -768,6 +748,11 @@ public class ExamStudentVo {
     public void setSubjectiveStatus(String subjectiveStatusStr) {
         this.subjectiveStatus = SubjectiveStatus.valueOf(subjectiveStatusStr);
     }
+    
+    public void copySubjectiveStatus(SubjectiveStatus sta) {
+        this.subjectiveStatus = sta;
+    }
+    
 
     public String getSecretNumber() {
         return secretNumber;
@@ -879,6 +864,7 @@ public class ExamStudentVo {
 	public static ExamStudentVo of(ExamStudent e) {
 		ExamStudentVo vo=new ExamStudentVo();
 		BeanUtils.copyProperties(e, vo);
+		vo.copySubjectiveStatus(e.getSubjectiveStatus());
 		return vo;
 	}
 }

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

@@ -98,6 +98,7 @@
            
         <c:if test="${exam.status=='FINISH' && web_user.schoolAdmin==true}">
        	<input id="btnImport" class="btn" type="button" value="导入"/>
+       	&nbsp;
        	</c:if>
        	<div class="btn-group">
                 <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">