交卷和交卷结果接口修改

themis-business/src/main/java/com/qmth/themis/business/bean/exam/ExamFinishBean.java

@@ -6,8 +6,10 @@ import com.qmth.themis.business.enums.ReviewResultEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.io.Serializable;
+
 @ApiModel("结束考试返回信息")
-public class ExamFinishBean {
+public class ExamFinishBean implements Serializable {
 
 	@ApiModelProperty("finishTime")
 	private Long finishTime;
@@ -21,6 +23,9 @@ public class ExamFinishBean {
 	@ApiModelProperty("审核结果")
 	private ReviewResultEnum reviewResult;
 
+	@ApiModelProperty(name = "考后说明")
+	private String postNotice;//考后说明，针对一个场次进行设置
+
 	public Long getFinishTime() {
 		return finishTime;
 	}
@@ -53,4 +58,11 @@ public class ExamFinishBean {
 		this.reviewResult = reviewResult;
 	}
 
+	public String getPostNotice() {
+		return postNotice;
+	}
+
+	public void setPostNotice(String postNotice) {
+		this.postNotice = postNotice;
+	}
 }

themis-business/src/main/java/com/qmth/themis/business/bean/exam/ExamResultBean.java

@@ -3,78 +3,89 @@ package com.qmth.themis.business.bean.exam;
 import com.qmth.themis.business.enums.FinishExamResultEnum;
 import com.qmth.themis.business.enums.FinishTypeEnum;
 import com.qmth.themis.business.enums.ReviewResultEnum;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.io.Serializable;
+
 @ApiModel("交卷结果返回信息")
-public class ExamResultBean {
+public class ExamResultBean implements Serializable {
+
+    @ApiModelProperty("finishTime")
+    private Long finishTime;
+
+    @ApiModelProperty("交卷类型")
+    private FinishTypeEnum finishType;
+
+    @ApiModelProperty("客观分")
+    private Double objectiveScore;
+
+    @ApiModelProperty("考试时长(秒)")
+    private Integer durationSeconds;
 
-	@ApiModelProperty("finishTime")
-	private Long finishTime;
+    @ApiModelProperty("审核结果")
+    private ReviewResultEnum reviewResult;
 
-	@ApiModelProperty("交卷类型")
-	private FinishTypeEnum finishType;
+    @ApiModelProperty("交卷后状态")
+    private FinishExamResultEnum status;
 
-	@ApiModelProperty("客观分")
-	private Double objectiveScore;
-	
-	@ApiModelProperty("考试时长(秒)")
-	private Integer durationSeconds;
+    @ApiModelProperty(name = "考后说明")
+    private String postNotice;//考后说明，针对一个场次进行设置
 
-	@ApiModelProperty("审核结果")
-	private ReviewResultEnum reviewResult;
-	
-	@ApiModelProperty("交卷后状态")
-	private FinishExamResultEnum status;
+    public Long getFinishTime() {
+        return finishTime;
+    }
 
-	public Long getFinishTime() {
-		return finishTime;
-	}
+    public void setFinishTime(Long finishTime) {
+        this.finishTime = finishTime;
+    }
 
-	public void setFinishTime(Long finishTime) {
-		this.finishTime = finishTime;
-	}
 
+    public FinishTypeEnum getFinishType() {
+        return finishType;
+    }
 
-	public FinishTypeEnum getFinishType() {
-		return finishType;
-	}
+    public void setFinishType(FinishTypeEnum finishType) {
+        this.finishType = finishType;
+    }
 
-	public void setFinishType(FinishTypeEnum finishType) {
-		this.finishType = finishType;
-	}
+    public Integer getDurationSeconds() {
+        return durationSeconds;
+    }
 
-	public Integer getDurationSeconds() {
-		return durationSeconds;
-	}
+    public void setDurationSeconds(Integer durationSeconds) {
+        this.durationSeconds = durationSeconds;
+    }
 
-	public void setDurationSeconds(Integer durationSeconds) {
-		this.durationSeconds = durationSeconds;
-	}
+    public Double getObjectiveScore() {
+        return objectiveScore;
+    }
 
-	public Double getObjectiveScore() {
-		return objectiveScore;
-	}
+    public void setObjectiveScore(Double objectiveScore) {
+        this.objectiveScore = objectiveScore;
+    }
 
-	public void setObjectiveScore(Double objectiveScore) {
-		this.objectiveScore = objectiveScore;
-	}
+    public ReviewResultEnum getReviewResult() {
+        return reviewResult;
+    }
 
-	public ReviewResultEnum getReviewResult() {
-		return reviewResult;
-	}
+    public void setReviewResult(ReviewResultEnum reviewResult) {
+        this.reviewResult = reviewResult;
+    }
 
-	public void setReviewResult(ReviewResultEnum reviewResult) {
-		this.reviewResult = reviewResult;
-	}
+    public FinishExamResultEnum getStatus() {
+        return status;
+    }
 
-	public FinishExamResultEnum getStatus() {
-		return status;
-	}
+    public void setStatus(FinishExamResultEnum status) {
+        this.status = status;
+    }
 
-	public void setStatus(FinishExamResultEnum status) {
-		this.status = status;
-	}
+    public String getPostNotice() {
+        return postNotice;
+    }
 
+    public void setPostNotice(String postNotice) {
+        this.postNotice = postNotice;
+    }
 }

themis-business/src/main/java/com/qmth/themis/business/service/impl/TEExamServiceImpl.java

@@ -980,6 +980,7 @@ public class TEExamServiceImpl extends ServiceImpl<TEExamMapper, TEExam> impleme
         }
 
         ExamCacheBean exam = getExamCacheBeanNative(es.getExamId());
+        ret.setPostNotice(exam.getPostNotice());
         ExamRecordStatusEnum sta = ExamRecordCacheUtil.getStatus(recordId);
         if (ExamRecordStatusEnum.FINISHED.equals(sta) || ExamRecordStatusEnum.PERSISTED.equals(sta)) {
             ret.setStatus(FinishExamResultEnum.NORMAL);
@@ -1177,9 +1178,10 @@ public class TEExamServiceImpl extends ServiceImpl<TEExamMapper, TEExam> impleme
             examId = ExamRecordCacheUtil.getExamId(recordId);
         }
 
+        ExamCacheBean exam = getExamCacheBeanNative(examId);
+        ret.setPostNotice(exam.getPostNotice());
         //页面结果
         if (hasAnswerFile.intValue() == 1) {
-            ExamCacheBean exam = getExamCacheBeanNative(examId);
             if (exam.getShowObjectiveScore() != null && exam.getShowObjectiveScore().intValue() == 1) {//实时出分
                 if (InvigilateVerifyEnum.NOW.equals(exam.getInvigilateVerify())) {//实时审核
                     if (warningCount != null && warningCount.intValue() > 0) {//有预警