From 8e55eda4500b9ac358fed07788060feb9f2e5ee0 Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Thu, 20 Aug 2026 10:03:13 +0800 Subject: [PATCH] PaperBasicInfo --- .../src/main/java/org/qinan/cedu/model/dto/PaperCopyDTO.java | 4 ++++ .../main/java/org/qinan/cedu/model/dto/PaperImportDTO.java | 4 ++++ .../main/java/org/qinan/cedu/model/dto/PaperUpdateDTO.java | 4 ++++ .../src/main/java/org/qinan/cedu/model/entity/PaperDO.java | 3 +++ .../main/java/org/qinan/cedu/model/vo/PaperBasicInfoVO.java | 3 +++ .../src/main/java/org/qinan/cedu/model/vo/PaperPageVO.java | 3 +++ .../java/org/qinan/cedu/service/impl/PaperServiceImpl.java | 1 + safety-cedu-service/src/test/java/db.sql | 1 + 8 files changed, 23 insertions(+) diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/PaperCopyDTO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/PaperCopyDTO.java index f0ec5354..db36dd63 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/PaperCopyDTO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/PaperCopyDTO.java @@ -38,4 +38,8 @@ public class PaperCopyDTO { @DecimalMin(value = "0", message = "合格分数不能小于0") @DecimalMax(value = "9999.99", message = "合格分数不能超过9999.99") private BigDecimal paperPassScore; + + @ApiModelProperty("考试时长（分钟）") + @Min(value = 1, message = "考试时长必须大于0") + private Integer examTime; } diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/PaperImportDTO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/PaperImportDTO.java index 9e5d11c7..55dd7adc 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/PaperImportDTO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/PaperImportDTO.java @@ -36,6 +36,10 @@ public class PaperImportDTO { @DecimalMax(value = "9999.99", message = "合格分数不能超过9999.99") private BigDecimal paperPassScore; + @ApiModelProperty("考试时长（分钟）") + @Min(value = 1, message = "考试时长必须大于0") + private Integer examTime; + @ApiModelProperty(value = "试题Excel文件（第一个sheet单选题，第二个sheet多选题，第三个sheet判断题）", required = true) @NotNull(message = "请上传试题Excel文件") private MultipartFile file; diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/PaperUpdateDTO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/PaperUpdateDTO.java index 2fd7e84e..79c90297 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/PaperUpdateDTO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/PaperUpdateDTO.java @@ -39,6 +39,10 @@ public class PaperUpdateDTO { @DecimalMax(value = "9999.99", message = "合格分数不能超过9999.99") private BigDecimal paperPassScore; + @ApiModelProperty("考试时长（分钟）") + @Min(value = 1, message = "考试时长必须大于0") + private Integer examTime; + @ApiModelProperty("试卷类型 fixed平台试卷,config_rule规则试卷") @Size(max = 36, message = "试卷类型长度不能超过36个字符") private String paperType; diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/PaperDO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/PaperDO.java index c58ff766..3463dd18 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/PaperDO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/PaperDO.java @@ -34,6 +34,9 @@ public class PaperDO extends BaseEntity { @ApiModelProperty("合格分数") private BigDecimal paperPassScore; + @ApiModelProperty("考试时长（分钟）") + private Integer examTime; + @ApiModelProperty("试卷状态 normal 正常") private String status; diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/PaperBasicInfoVO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/PaperBasicInfoVO.java index c9cc984a..07f55b9c 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/PaperBasicInfoVO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/PaperBasicInfoVO.java @@ -34,6 +34,9 @@ public class PaperBasicInfoVO { @ApiModelProperty("合格分数") private BigDecimal paperPassScore; + @ApiModelProperty("考试时长（分钟）") + private Integer examTime; + @ApiModelProperty("试卷状态 normal 正常") private String status; diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/PaperPageVO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/PaperPageVO.java index bb9b7d09..1bc20cc5 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/PaperPageVO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/PaperPageVO.java @@ -30,6 +30,9 @@ public class PaperPageVO { @ApiModelProperty("合格分数") private BigDecimal paperPassScore; + @ApiModelProperty("考试时长（分钟）") + private Integer examTime; + @ApiModelProperty("试卷状态 normal 正常") private String status; diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/PaperServiceImpl.java b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/PaperServiceImpl.java index fa632bc1..5deb2081 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/PaperServiceImpl.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/PaperServiceImpl.java @@ -250,6 +250,7 @@ public class PaperServiceImpl extends ServiceImpl implemen paper.setPaperName(importDTO.getPaperName().trim()); paper.setPaperTotalScore(importDTO.getPaperTotalScore()); paper.setPaperPassScore(importDTO.getPaperPassScore()); + paper.setExamTime(importDTO.getExamTime()); InsertFieldDefaults.applyIgnoreOrgId(paper); this.savePaper(paper); diff --git a/safety-cedu-service/src/test/java/db.sql b/safety-cedu-service/src/test/java/db.sql index 65c35f82..ccca7f73 100644 --- a/safety-cedu-service/src/test/java/db.sql +++ b/safety-cedu-service/src/test/java/db.sql @@ -28,6 +28,7 @@ CREATE TABLE `paperEntity` `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_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 正常', `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 '备注',