Merge branch 'dev'

1

themis-backend/src/main/java/com/qmth/themis/backend/api/TIeInvigilateController.java

@@ -202,8 +202,18 @@ public class TIeInvigilateController {
         }
         //获取考试记录缓存
         Long examId = ExamRecordCacheUtil.getExamId(examRecordId);
-        Long examStudentId = ExamRecordCacheUtil.getExamStudentId(examRecordId);
-        Long examActivityId = ExamRecordCacheUtil.getExamActivityId(examRecordId);
+        TOeExamRecord tOeExamRecord = null;
+        Long examStudentId = null;
+        Long examActivityId = null;
+        if (Objects.isNull(examId)) {
+            tOeExamRecord = tOeExamRecordService.getById(examRecordId);
+            examId = tOeExamRecord.getExamId();
+            examStudentId = tOeExamRecord.getExamStudentId();
+            examActivityId = tOeExamRecord.getExamActivityId();
+        } else {
+            examStudentId = ExamRecordCacheUtil.getExamStudentId(examRecordId);
+            examActivityId = ExamRecordCacheUtil.getExamActivityId(examRecordId);
+        }
         ExamRecordStatusEnum status = ExamRecordCacheUtil.getStatus(examRecordId);
         Integer breachStatus = Objects.isNull(ExamRecordCacheUtil.getBreachStatus(examRecordId)) ? null : ExamRecordCacheUtil.getBreachStatus(examRecordId);
         ExamStudentCacheBean examStudentCacheBean = teExamStudentService.getExamStudentCacheBean(examStudentId);

themis-business/src/main/resources/mapper/TOeExamRecordMapper.xml

@@ -504,7 +504,7 @@
 
 	<select id="getDoneCountByDay" resultType="java.util.Map">
 		select
-		FROM_UNIXTIME(f.first_prepare_time / 1000,'%Y-%m-%d') AS day
+		FROM_UNIXTIME(f.first_prepare_time / 1000,'%Y-%m-%d') AS day,
 		count(DISTINCT(f.exam_student_id)) count from t_oe_exam_record f
 		left join t_e_exam_student t on f.exam_student_id=t.id
 		where f.exam_id = #{examId}