From 8458e64aab474c0fc2f49ae4ff22fb11ce5cf6e2 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: Mon, 11 Nov 2024 16:55:28 +0800
Subject: [PATCH] 批次新增学员查询条件，新增题目导入接口
---
exam-system/src/main/java/com/gkhy/exam/system/domain/ExPaperStudent.java | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/system/domain/ExPaperStudent.java b/exam-system/src/main/java/com/gkhy/exam/system/domain/ExPaperStudent.java
index a9de385..9face33 100644
--- a/exam-system/src/main/java/com/gkhy/exam/system/domain/ExPaperStudent.java
+++ b/exam-system/src/main/java/com/gkhy/exam/system/domain/ExPaperStudent.java
@@ -29,7 +29,7 @@
@TableName("ex_paper_student")
@ApiModel(value = "ExPaperStudent对象", description = "学员与考试题目关系表")
@JsonInclude(NON_NULL)
-public class ExPaperStudent implements Serializable {
+public class ExPaperStudent implements Serializable {
private static final long serialVersionUID = 1L;
@@ -55,9 +55,9 @@
@TableField("passed")
private Integer passed;
- @ApiModelProperty("是否完成考试(0否，1是 默认0)")
- @TableField("completed")
- private Integer completed;
+// @ApiModelProperty("是否完成考试(0否，1是 默认0)")
+// @TableField("completed")
+// private Integer completed;
@ApiModelProperty("考试时长(分钟)")
@TableField("use_time")
@@ -70,6 +70,10 @@
@ApiModelProperty("考试结束时间(时间戳13位ms)")
@TableField("end_time")
private Long endTime;
+
+ @ApiModelProperty("状态:0待考试，1待批阅 2批阅完成,默认0")
+ @TableField("state")
+ private Integer state;
@ApiModelProperty("创建时间")
@TableField("create_time")
@@ -100,32 +104,38 @@
@TableField("create_id")
private Long createId;
- @ApiModelProperty("学员名称")
+ @ApiModelProperty(value = "学生名称")
@TableField(exist = false)
private String studentName;
- @ApiModelProperty("学员手机号")
+ @ApiModelProperty(value = "学生手机号")
@TableField(exist = false)
private String studentPhone;
- @ApiModelProperty("试卷名称")
+ @ApiModelProperty(value = "分配人名称")
@TableField(exist = false)
- private String paperName;
+ private String createName;
+
+ @ApiModelProperty(value = "公司id")
+ @TableField(exist = false)
+ private Long companyId;
+
+ @ApiModelProperty(value = "公司名称")
+ @TableField(exist = false)
+ private String companyName;
@ApiModelProperty("试卷对象")
@TableField(exist = false)
private ExExamPaper examPaper;
- @ApiModelProperty("单选题列表")
+ @ApiModelProperty("学员对象")
@TableField(exist = false)
- private List<ExQuestion> singleQuestions;
+ private ExStudent student;
- @ApiModelProperty("多选题列表")
- @TableField(exist = false)
- private List<ExQuestion> multiQuestions;
- @ApiModelProperty("判断题列表")
+ @ApiModelProperty("题目列表")
@TableField(exist = false)
- private List<ExQuestion> judgeQuestions;
+ private List<ExQuestion> questions;
+
}
--
Gitblit v1.9.2