2025年4月18日15:49:00
parent
e1eb598a33
commit
dab0fbe735
|
|
@ -172,6 +172,12 @@ public class ExamController {
|
||||||
Paper paper = exam.getPaper();
|
Paper paper = exam.getPaper();
|
||||||
|
|
||||||
map.put("id", exam.getId());
|
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);
|
resultList.add(map);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -25,12 +25,47 @@ import java.util.List;
|
||||||
@Table(name = "exam")
|
@Table(name = "exam")
|
||||||
public class Exam extends BaseEntity<Long> {
|
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
|
@ManyToOne
|
||||||
private User user;//考试人
|
private User user;//考试人
|
||||||
|
|
||||||
@ManyToOne
|
@ManyToOne
|
||||||
private Paper paper;//试卷
|
private Paper paper;//试卷
|
||||||
|
|
||||||
|
private Status status;//考试状态 0 未开始 1 进行中 2 已结束
|
||||||
|
|
||||||
@OneToMany(mappedBy = "exam")
|
@OneToMany(mappedBy = "exam")
|
||||||
private List<ExamAnswer> examAnswers = new ArrayList<>();//考试信息
|
private List<ExamAnswer> examAnswers = new ArrayList<>();//考试信息
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue