|
@@ -2,6 +2,10 @@ package cn.com.qmth.stmms.biz.exam.bean;
|
|
|
|
|
|
import java.util.Date;
|
|
|
|
|
|
+import javax.validation.constraints.NotNull;
|
|
|
+
|
|
|
+import org.hibernate.validator.constraints.NotBlank;
|
|
|
+
|
|
|
import cn.com.qmth.stmms.biz.exam.model.Exam;
|
|
|
import cn.com.qmth.stmms.biz.file.enums.FormatType;
|
|
|
import cn.com.qmth.stmms.common.enums.ExamStatus;
|
|
@@ -17,6 +21,7 @@ public class ExamVo {
|
|
|
|
|
|
private Integer id;
|
|
|
|
|
|
+ @NotBlank(message = "名称不能为空")
|
|
|
@ApiModelProperty(value = "名称")
|
|
|
private String name;
|
|
|
|
|
@@ -25,9 +30,7 @@ public class ExamVo {
|
|
|
@ApiModelProperty(value = "code")
|
|
|
private String code;
|
|
|
|
|
|
- @ApiModelProperty(value = "考试时间")
|
|
|
- private Date examTime;
|
|
|
-
|
|
|
+ @NotNull(message = "状态不能为空")
|
|
|
@ApiModelProperty(value = "状态")
|
|
|
private ExamStatus status;
|
|
|
|
|
@@ -37,6 +40,7 @@ public class ExamVo {
|
|
|
/**
|
|
|
* 开启强制特殊标记
|
|
|
*/
|
|
|
+ @NotNull(message = "强制标记不能为空")
|
|
|
@ApiModelProperty(value = "开启强制特殊标记")
|
|
|
private Boolean forceSpecialTag;
|
|
|
|
|
@@ -67,6 +71,7 @@ public class ExamVo {
|
|
|
/**
|
|
|
* 考试类型
|
|
|
*/
|
|
|
+ @NotNull(message = "考试类型不能为空")
|
|
|
@ApiModelProperty(value = "考试类型")
|
|
|
private ExamType type;
|
|
|
|
|
@@ -79,12 +84,14 @@ public class ExamVo {
|
|
|
/**
|
|
|
* 禁止管理员以外人查看考生个人信息
|
|
|
*/
|
|
|
+ @NotNull(message = "禁止他人查看考生信息不能为空")
|
|
|
@ApiModelProperty(value = "禁止管理员以外人查看考生个人信息")
|
|
|
private Boolean forbiddenInfo;
|
|
|
|
|
|
/**
|
|
|
* 禁止查看成绩
|
|
|
*/
|
|
|
+ @NotNull(message = "禁止科组长成绩查询不能为空")
|
|
|
@ApiModelProperty(value = "禁止查看成绩")
|
|
|
private Boolean forbiddenScore;
|
|
|
|
|
@@ -109,12 +116,14 @@ public class ExamVo {
|
|
|
/**
|
|
|
* 强制评卷模式
|
|
|
*/
|
|
|
- @ApiModelProperty(value = "强制评卷模式")
|
|
|
+ @NotNull(message = "评卷模式不能为空")
|
|
|
+ @ApiModelProperty(value = "评卷模式")
|
|
|
private MarkMode markMode;
|
|
|
|
|
|
/**
|
|
|
* 开启/关闭 原卷显示
|
|
|
*/
|
|
|
+ @NotNull(message = "原卷显示不能为空")
|
|
|
@ApiModelProperty(value = "开启/关闭 原卷显示")
|
|
|
private Boolean sheetView;
|
|
|
|
|
@@ -127,34 +136,40 @@ public class ExamVo {
|
|
|
/**
|
|
|
* 自动跳转
|
|
|
*/
|
|
|
+ @NotNull(message = "评卷提交自动定位不能为空")
|
|
|
@ApiModelProperty(value = "评卷提交自动定位")
|
|
|
private Boolean autoScroll;
|
|
|
|
|
|
/**
|
|
|
* 是否裁切
|
|
|
*/
|
|
|
+ @NotNull(message = "自劝对切题卡不能为空")
|
|
|
@ApiModelProperty(value = "自动对切题卡")
|
|
|
private Boolean enableSplit;
|
|
|
|
|
|
/**
|
|
|
* 打回后是否显示原分值
|
|
|
*/
|
|
|
+ @NotNull(message = "打回后是否显示原分值不能为空")
|
|
|
@ApiModelProperty(value = "打回后是否显示原分值")
|
|
|
private Boolean showReject;
|
|
|
|
|
|
/**
|
|
|
* 全卷多次复核时不能为同一账号
|
|
|
*/
|
|
|
+ @NotNull(message = "全卷多次复核不能同一账号不能为空")
|
|
|
@ApiModelProperty(value = "全卷多次复核时不能为同一账号")
|
|
|
private Boolean inspectUnrepeated;
|
|
|
|
|
|
/**
|
|
|
* 全卷复核时强制试卷拉到底部
|
|
|
*/
|
|
|
+ @NotNull(message = "全卷复核强制试卷拉到底部不能为空")
|
|
|
@ApiModelProperty(value = "全卷复核时强制试卷拉到底部")
|
|
|
private Boolean inspectScrollBottom;
|
|
|
|
|
|
// 评卷时强制试卷拉到底部
|
|
|
+ @NotNull(message = "评卷时强制试卷拉到底部不能为空")
|
|
|
@ApiModelProperty(value = "评卷时强制试卷拉到底部")
|
|
|
private Boolean markScrollBottom;
|
|
|
|
|
@@ -167,12 +182,14 @@ public class ExamVo {
|
|
|
/**
|
|
|
* 评卷端是否显示客观分
|
|
|
*/
|
|
|
+ @NotNull(message = "评卷端显示客观分不能为空")
|
|
|
@ApiModelProperty(value = "评卷端是否显示客观分")
|
|
|
private Boolean showObjectiveScore;
|
|
|
|
|
|
/**
|
|
|
* 全卷复核进度100%时才能再次复核
|
|
|
*/
|
|
|
+ @NotNull(message = "全卷复核进度100%才能再次复核不能为空")
|
|
|
@ApiModelProperty(value = "全卷复核进度100%时才能再次复核")
|
|
|
private Boolean inspectRoundLimit;
|
|
|
|
|
@@ -200,10 +217,12 @@ public class ExamVo {
|
|
|
private Integer reMarkLimitCount;
|
|
|
|
|
|
// 启用条码粘贴AI检测
|
|
|
+ @NotNull(message = "启用条码粘贴AI检测不能为空")
|
|
|
@ApiModelProperty(value = "启用条码粘贴AI检测")
|
|
|
private Boolean barcodeAiCheck;
|
|
|
|
|
|
// 启用题卡作答AI检测
|
|
|
+ @NotNull(message = "启用题卡作答AI检测不能为空")
|
|
|
@ApiModelProperty(value = "启用题卡作答AI检测")
|
|
|
private Boolean answerAiCheck;
|
|
|
|
|
@@ -239,14 +258,6 @@ public class ExamVo {
|
|
|
this.code = code;
|
|
|
}
|
|
|
|
|
|
- public Date getExamTime() {
|
|
|
- return examTime;
|
|
|
- }
|
|
|
-
|
|
|
- public void setExamTime(Date examTime) {
|
|
|
- this.examTime = examTime;
|
|
|
- }
|
|
|
-
|
|
|
public ExamStatus getStatus() {
|
|
|
return status;
|
|
|
}
|
|
@@ -544,7 +555,6 @@ public class ExamVo {
|
|
|
ret.setName(from.getName());
|
|
|
ret.setSchoolId(from.getSchoolId());
|
|
|
ret.setCode(from.getCode());
|
|
|
- ret.setExamTime(from.getExamTime());
|
|
|
ret.setStatus(from.getStatus());
|
|
|
ret.setDescription(from.getDescription());
|
|
|
ret.setForceSpecialTag(from.isForceSpecialTag());
|
|
@@ -592,7 +602,6 @@ public class ExamVo {
|
|
|
ret.setName(from.getName());
|
|
|
ret.setSchoolId(from.getSchoolId());
|
|
|
ret.setCode(from.getCode());
|
|
|
- ret.setExamTime(from.getExamTime());
|
|
|
ret.setStatus(from.getStatus());
|
|
|
ret.setDescription(from.getDescription());
|
|
|
ret.setForceSpecialTag(from.getForceSpecialTag());
|