fixbug

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

@@ -1,5 +1,7 @@
 package com.qmth.themis.business.bean.exam;
 
+import com.qmth.themis.business.enums.FinishExamResultEnum;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -10,7 +12,7 @@ public class ExamFinishBean {
 	private Long finishTime;
 
 	@ApiModelProperty("交卷后状态")
-	private String status;
+	private FinishExamResultEnum status;
 
 	@ApiModelProperty("客观分")
 	private Double objectiveScore;
@@ -26,11 +28,11 @@ public class ExamFinishBean {
 		this.finishTime = finishTime;
 	}
 
-	public String getStatus() {
+	public FinishExamResultEnum getStatus() {
 		return status;
 	}
 
-	public void setStatus(String status) {
+	public void setStatus(FinishExamResultEnum status) {
 		this.status = status;
 	}
 

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

@@ -53,6 +53,7 @@ import com.qmth.themis.business.dto.response.TEExamQueryDto;
 import com.qmth.themis.business.entity.TEExam;
 import com.qmth.themis.business.entity.TOeExamRecord;
 import com.qmth.themis.business.enums.ExamRecordStatusEnum;
+import com.qmth.themis.business.enums.FinishExamResultEnum;
 import com.qmth.themis.business.enums.FinishTypeEnum;
 import com.qmth.themis.business.service.TEExamActivityService;
 import com.qmth.themis.business.service.TEExamCourseService;
@@ -607,6 +608,17 @@ public class TEExamServiceImpl extends ServiceImpl<TEExamMapper, TEExam> impleme
         ExamFinishBean ret = new ExamFinishBean();
         ret.setFinishTime(now.getTime());
         ret.setObjectiveScore(ExamRecordCacheUtil.getObjectiveScore(recordId));
+        ExamCacheBean exam=getExamCacheBean(es.getExamId());
+        //TODO
+        if(exam.getShowObjectiveScore()!=null&&exam.getShowObjectiveScore().intValue()==1) {//实时出分
+        	if(ret.getObjectiveScore()==null) {
+        		ret.setStatus(FinishExamResultEnum.SCORE_CALCULATE);
+        	}else {
+        		ret.setStatus(FinishExamResultEnum.SCORE_VIEW);
+        	}
+        }else {
+        	ret.setStatus(FinishExamResultEnum.NORMAL);
+        }
         // TODO
         ret.setReviewResult("");
         ExamRecordCacheUtil.setFinishTime(recordId, now);