From dab0fbe735f48ad60f09845011518b46fe678086 Mon Sep 17 00:00:00 2001
From: qmstyle <qmstyle@noreply.gitcode.com>
Date: Fri, 18 Apr 2025 17:34:08 +0800
Subject: [PATCH] =?UTF-8?q?2025=E5=B9=B44=E6=9C=8818=E6=97=A515:49:00?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../exam/controller/ExamController.java       |  6 ++++
 .../zhangmeng/online/exam/entity/Exam.java    | 35 +++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/src/main/java/com/zhangmeng/online/exam/controller/ExamController.java b/src/main/java/com/zhangmeng/online/exam/controller/ExamController.java
index d8b3cac..7c1da64 100644
--- a/src/main/java/com/zhangmeng/online/exam/controller/ExamController.java
+++ b/src/main/java/com/zhangmeng/online/exam/controller/ExamController.java
@@ -172,6 +172,12 @@ public class ExamController {
             Paper paper = exam.getPaper();
 
             map.put("id", exam.getId());
+            map.put("paperName", paper.getName());
+            map.put("paperId", paper.getId());
+            map.put("examTime", paper.getExamTime());
+            map.put("subjectName", paper.getSubject().getName());
+            map.put("score", paper.getTotalScore());
+            map.put("status",exam.getStatus() == null ? "" : exam.getStatus().getDesc());
 
             resultList.add(map);
         }
diff --git a/src/main/java/com/zhangmeng/online/exam/entity/Exam.java b/src/main/java/com/zhangmeng/online/exam/entity/Exam.java
index 7727b98..a457fbc 100644
--- a/src/main/java/com/zhangmeng/online/exam/entity/Exam.java
+++ b/src/main/java/com/zhangmeng/online/exam/entity/Exam.java
@@ -25,12 +25,47 @@ import java.util.List;
 @Table(name = "exam")
 public class Exam extends BaseEntity<Long> {
 
+    public enum Status{
+
+        NOT_STARTED(0,"未开始"),
+        IN_PROGRESS(1,"进行中"),
+        COMPLETED(2,"已结束");
+
+
+        private int index;
+
+        private String desc;
+
+        Status(int index, String desc) {
+            this.index = index;
+            this.desc = desc;
+        }
+
+        public int getIndex() {
+            return index;
+        }
+
+        public void setIndex(int index) {
+            this.index = index;
+        }
+
+        public String getDesc() {
+            return desc;
+        }
+
+        public void setDesc(String desc) {
+            this.desc = desc;
+        }
+    }
+
     @ManyToOne
     private User user;//考试人
 
     @ManyToOne
     private Paper paper;//试卷
 
+    private Status status;//考试状态 0 未开始 1 进行中 2 已结束
+
     @OneToMany(mappedBy = "exam")
     private List<ExamAnswer> examAnswers = new ArrayList<>();//考试信息
 }