From a39e023677a9c5c68ba3b6577f0d7da24b9dc65e Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: Wed, 30 Oct 2024 11:14:08 +0800
Subject: [PATCH] update
---
exam-system/src/main/java/com/gkhy/exam/system/domain/ExExamPaper.java | 99 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 70 insertions(+), 29 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/system/domain/ExExamPaper.java b/exam-system/src/main/java/com/gkhy/exam/system/domain/ExExamPaper.java
index 62cca8b..0399f30 100644
--- a/exam-system/src/main/java/com/gkhy/exam/system/domain/ExExamPaper.java
+++ b/exam-system/src/main/java/com/gkhy/exam/system/domain/ExExamPaper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonInclude;
+import com.gkhy.exam.system.domain.vo.PaperStudentInfoVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@@ -69,80 +70,106 @@
private Integer limitTime;
@ApiModelProperty("是否限制考试时间(0否，1是，默认0)")
- @TableField("limit")
- private Integer limit;
+ @TableField("limited")
+ private Integer limited;
- @NotNull(message = "单选题目数量不能为空")
- @Min(value = 1,message = "单选题目数量必须大于0")
+// @NotNull(message = "单选题目数量不能为空")
+// @Min(value = 1,message = "单选题目数量必须大于0")
@ApiModelProperty(value = "单选题目数量",required = true)
@TableField("single_num")
private Integer singleNum;
- @NotNull(message = "单选题每题分数不能为空")
- @Min(value = 1,message = "单选题每题分数必须大于0")
+// @NotNull(message = "单选题每题分数不能为空")
+// @Min(value = 1,message = "单选题每题分数必须大于0")
@ApiModelProperty(value = "单选题每题分数",required = true)
@TableField("single_score")
private Integer singleScore;
- @NotNull(message = "单选题题库不能为空")
+ // @NotNull(message = "单选题题库不能为空")
@ApiModelProperty(value = "单选题题库id",required = true)
@TableField("single_bank_id")
private Long singleBankId;
- @NotNull(message = "单选题出题方式不能为空")
+ // @NotNull(message = "单选题出题方式不能为空")
@ApiModelProperty(value = "单选题出题方式1随机，2顺序，默认1",required = true)
@TableField("single_method")
private Integer singleMethod;
- @NotNull(message = "多选题目数量不能为空")
- @Min(value = 1,message = "多选题目数量必须大于0")
+ // @NotNull(message = "多选题目数量不能为空")
+ // @Min(value = 1,message = "多选题目数量必须大于0")
@ApiModelProperty(value = "多选题目数量",required = true)
@TableField("multi_num")
private Integer multiNum;
- @NotNull(message = "多选题每题分数不能为空")
- @Min(value = 1,message = "多选题每题分数必须大于0")
+ // @NotNull(message = "多选题每题分数不能为空")
+ // @Min(value = 1,message = "多选题每题分数必须大于0")
@ApiModelProperty(value = "多选题每题分数",required = true)
@TableField("multi_score")
private Integer multiScore;
- @NotNull(message = "多选题题库不能为空")
+ // @NotNull(message = "多选题题库不能为空")
@ApiModelProperty(value = "多选题题库id",required = true)
@TableField("multi_bank_id")
private Long multiBankId;
- @NotNull(message = "多选题出题方式不能为空")
+ // @NotNull(message = "多选题出题方式不能为空")
@ApiModelProperty(value = "多选题出题方式1随机，2顺序，默认1",required = true)
@TableField("multi_method")
private Integer multiMethod;
- @NotNull(message = "判断题目数量不能为空")
- @Min(value = 1,message = "判断题目数量必须大于0")
+ // @NotNull(message = "判断题目数量不能为空")
+ // @Min(value = 1,message = "判断题目数量必须大于0")
@ApiModelProperty(value = "判断题目数量",required = true)
@TableField("judge_num")
private Integer judgeNum;
- @NotNull(message = "判断题每题分数不能为空")
- @Min(value = 1,message = "判断题每题分数必须大于0")
+// @NotNull(message = "判断题每题分数不能为空")
+ // @Min(value = 1,message = "判断题每题分数必须大于0")
@ApiModelProperty(value = "判断题每题分数",required = true)
@TableField("judge_score")
private Integer judgeScore;
- @NotNull(message = "判断题题库不能为空")
+ // @NotNull(message = "判断题题库不能为空")
@ApiModelProperty(value = "判断题题库id",required = true)
@TableField("judge_bank_id")
private Long judgeBankId;
- @NotNull(message = "判断题出题方式不能为空")
+ // @NotNull(message = "判断题出题方式不能为空")
@ApiModelProperty(value = "判断题出题方式1随机，2顺序，默认1",required = true)
@TableField("judge_method")
private Integer judgeMethod;
+
+ @ApiModelProperty(value = "简答题题目数量",required = true)
+ @TableField("easy_num")
+ private Integer easyNum;
+
+// @NotNull(message = "简答题每题分数不能为空")
+ // @Min(value = 1,message = "简答题每题分数必须大于0")
+ @ApiModelProperty(value = "简答题每题分数",required = true)
+ @TableField("easy_score")
+ private Integer easyScore;
+
+// @NotNull(message = "简答题题库不能为空")
+ @ApiModelProperty(value = "简答题题库id",required = true)
+ @TableField("easy_bank_id")
+ private Long easyBankId;
+
+ // @NotNull(message = "简答题出题方式不能为空")
+ @ApiModelProperty(value = "简答题出题方式1随机，2顺序，默认1",required = true)
+ @TableField("easy_method")
+ private Integer easyMethod;
+
@NotNull(message = "合格分数不能为空")
@Min(value = 1,message = "合格分数必须大于0")
@ApiModelProperty(value = "合格分数",required = true)
@TableField("pass_score")
private Integer passScore;
+
+ @NotNull(message = "考试截止时间不能为空")
+ @ApiModelProperty("考试截止时间")
+ @TableField("deadline")
+ private LocalDateTime deadline;
@ApiModelProperty("创建时间")
@TableField("create_time")
@@ -183,26 +210,40 @@
@ApiModelProperty("单选题是否重新出题，0否 1是(编辑时传参)")
@TableField(exist = false)
- private Integer singleRebuild;
+ private Integer singleRebuild=0;
@ApiModelProperty("多选题是否重新出题，0否 1是(编辑时传参)")
@TableField(exist = false)
- private Integer multiRebuild;
+ private Integer multiRebuild=0;
@ApiModelProperty("判断题是否重新出题，0否 1是(编辑时传参)")
@TableField(exist = false)
- private Integer judgeRebuild;
+ private Integer judgeRebuild=0;
- @ApiModelProperty("单选题列表")
+ @ApiModelProperty("简答题是否重新出题，0否 1是(编辑时传参)")
@TableField(exist = false)
- private List<ExQuestion> singleQuestions;
+ private Integer easyRebuild=0;
- @ApiModelProperty("多选题列表")
+ @ApiModelProperty("题目列表")
@TableField(exist = false)
- private List<ExQuestion> multiQuestions;
+ private List<ExQuestion> questions;
- @ApiModelProperty("判断题列表")
+ @ApiModelProperty("学员统计信息")
@TableField(exist = false)
- private List<ExQuestion> judgeQuestions;
+ private PaperStudentInfoVO paperStudentInfoVO;
+
+ @ApiModelProperty("单选题题库名称")
+ @TableField(exist = false)
+ private String singleBankName;
+ @ApiModelProperty("多选题题库名称")
+ @TableField(exist = false)
+ private String multiBankName;
+ @ApiModelProperty("判断题题库名称")
+ @TableField(exist = false)
+ private String judgeBankName;
+ @ApiModelProperty("简答题题库名称")
+ @TableField(exist = false)
+ private String easyBankName;
+
}
--
Gitblit v1.9.2