PaperBasicInfo
parent
436cc83033
commit
8e55eda450
|
|
@ -38,4 +38,8 @@ public class PaperCopyDTO {
|
||||||
@DecimalMin(value = "0", message = "合格分数不能小于0")
|
@DecimalMin(value = "0", message = "合格分数不能小于0")
|
||||||
@DecimalMax(value = "9999.99", message = "合格分数不能超过9999.99")
|
@DecimalMax(value = "9999.99", message = "合格分数不能超过9999.99")
|
||||||
private BigDecimal paperPassScore;
|
private BigDecimal paperPassScore;
|
||||||
|
|
||||||
|
@ApiModelProperty("考试时长(分钟)")
|
||||||
|
@Min(value = 1, message = "考试时长必须大于0")
|
||||||
|
private Integer examTime;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -36,6 +36,10 @@ public class PaperImportDTO {
|
||||||
@DecimalMax(value = "9999.99", message = "合格分数不能超过9999.99")
|
@DecimalMax(value = "9999.99", message = "合格分数不能超过9999.99")
|
||||||
private BigDecimal paperPassScore;
|
private BigDecimal paperPassScore;
|
||||||
|
|
||||||
|
@ApiModelProperty("考试时长(分钟)")
|
||||||
|
@Min(value = 1, message = "考试时长必须大于0")
|
||||||
|
private Integer examTime;
|
||||||
|
|
||||||
@ApiModelProperty(value = "试题Excel文件(第一个sheet单选题,第二个sheet多选题,第三个sheet判断题)", required = true)
|
@ApiModelProperty(value = "试题Excel文件(第一个sheet单选题,第二个sheet多选题,第三个sheet判断题)", required = true)
|
||||||
@NotNull(message = "请上传试题Excel文件")
|
@NotNull(message = "请上传试题Excel文件")
|
||||||
private MultipartFile file;
|
private MultipartFile file;
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,10 @@ public class PaperUpdateDTO {
|
||||||
@DecimalMax(value = "9999.99", message = "合格分数不能超过9999.99")
|
@DecimalMax(value = "9999.99", message = "合格分数不能超过9999.99")
|
||||||
private BigDecimal paperPassScore;
|
private BigDecimal paperPassScore;
|
||||||
|
|
||||||
|
@ApiModelProperty("考试时长(分钟)")
|
||||||
|
@Min(value = 1, message = "考试时长必须大于0")
|
||||||
|
private Integer examTime;
|
||||||
|
|
||||||
@ApiModelProperty("试卷类型 fixed平台试卷,config_rule规则试卷")
|
@ApiModelProperty("试卷类型 fixed平台试卷,config_rule规则试卷")
|
||||||
@Size(max = 36, message = "试卷类型长度不能超过36个字符")
|
@Size(max = 36, message = "试卷类型长度不能超过36个字符")
|
||||||
private String paperType;
|
private String paperType;
|
||||||
|
|
|
||||||
|
|
@ -34,6 +34,9 @@ public class PaperDO extends BaseEntity {
|
||||||
@ApiModelProperty("合格分数")
|
@ApiModelProperty("合格分数")
|
||||||
private BigDecimal paperPassScore;
|
private BigDecimal paperPassScore;
|
||||||
|
|
||||||
|
@ApiModelProperty("考试时长(分钟)")
|
||||||
|
private Integer examTime;
|
||||||
|
|
||||||
@ApiModelProperty("试卷状态 normal 正常")
|
@ApiModelProperty("试卷状态 normal 正常")
|
||||||
private String status;
|
private String status;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -34,6 +34,9 @@ public class PaperBasicInfoVO {
|
||||||
@ApiModelProperty("合格分数")
|
@ApiModelProperty("合格分数")
|
||||||
private BigDecimal paperPassScore;
|
private BigDecimal paperPassScore;
|
||||||
|
|
||||||
|
@ApiModelProperty("考试时长(分钟)")
|
||||||
|
private Integer examTime;
|
||||||
|
|
||||||
@ApiModelProperty("试卷状态 normal 正常")
|
@ApiModelProperty("试卷状态 normal 正常")
|
||||||
private String status;
|
private String status;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -30,6 +30,9 @@ public class PaperPageVO {
|
||||||
@ApiModelProperty("合格分数")
|
@ApiModelProperty("合格分数")
|
||||||
private BigDecimal paperPassScore;
|
private BigDecimal paperPassScore;
|
||||||
|
|
||||||
|
@ApiModelProperty("考试时长(分钟)")
|
||||||
|
private Integer examTime;
|
||||||
|
|
||||||
@ApiModelProperty("试卷状态 normal 正常")
|
@ApiModelProperty("试卷状态 normal 正常")
|
||||||
private String status;
|
private String status;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -250,6 +250,7 @@ public class PaperServiceImpl extends ServiceImpl<PaperMapper, PaperDO> implemen
|
||||||
paper.setPaperName(importDTO.getPaperName().trim());
|
paper.setPaperName(importDTO.getPaperName().trim());
|
||||||
paper.setPaperTotalScore(importDTO.getPaperTotalScore());
|
paper.setPaperTotalScore(importDTO.getPaperTotalScore());
|
||||||
paper.setPaperPassScore(importDTO.getPaperPassScore());
|
paper.setPaperPassScore(importDTO.getPaperPassScore());
|
||||||
|
paper.setExamTime(importDTO.getExamTime());
|
||||||
InsertFieldDefaults.applyIgnoreOrgId(paper);
|
InsertFieldDefaults.applyIgnoreOrgId(paper);
|
||||||
this.savePaper(paper);
|
this.savePaper(paper);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,7 @@ CREATE TABLE `paperEntity`
|
||||||
`paper_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '试卷名称',
|
`paper_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '试卷名称',
|
||||||
`paper_total_score` decimal(6, 2) NOT NULL DEFAULT 0.00 COMMENT '试卷总分',
|
`paper_total_score` decimal(6, 2) NOT NULL DEFAULT 0.00 COMMENT '试卷总分',
|
||||||
`paper_pass_score` decimal(6, 2) NOT NULL DEFAULT 0.00 COMMENT '合格分数',
|
`paper_pass_score` decimal(6, 2) NOT NULL DEFAULT 0.00 COMMENT '合格分数',
|
||||||
|
`exam_time` int NULL COMMENT '考试时长(分钟)',
|
||||||
`status` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '试卷试卷状态 normal 正常',
|
`status` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '试卷试卷状态 normal 正常',
|
||||||
`delete_enum` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '删除标识true false',
|
`delete_enum` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '删除标识true false',
|
||||||
`remarks` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
|
`remarks` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue