diff --git a/src/main/java/com/project/information/domain/dto/InformationDTO.java b/src/main/java/com/project/information/domain/dto/InformationDTO.java index aa82c0a..9a7d9f0 100644 --- a/src/main/java/com/project/information/domain/dto/InformationDTO.java +++ b/src/main/java/com/project/information/domain/dto/InformationDTO.java @@ -1,10 +1,7 @@ package com.project.information.domain.dto; -import com.baomidou.mybatisplus.annotation.TableField; import com.project.base.domain.dto.BaseDTO; -import jakarta.persistence.Column; import lombok.Data; -import org.hibernate.annotations.Comment; @Data public class InformationDTO extends BaseDTO { @@ -18,6 +15,6 @@ public class InformationDTO extends BaseDTO { private String fileSuffix; private String parseName; - + private Integer draftStatus; } diff --git a/src/main/java/com/project/information/domain/entity/InformationEntity.java b/src/main/java/com/project/information/domain/entity/InformationEntity.java index 0317a75..e19ac06 100644 --- a/src/main/java/com/project/information/domain/entity/InformationEntity.java +++ b/src/main/java/com/project/information/domain/entity/InformationEntity.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.project.base.domain.entity.BaseEntity; +import com.project.information.domain.enums.DraftStatusEnum; import com.project.information.domain.enums.InformationParseStatusEnum; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -53,4 +54,11 @@ public class InformationEntity extends BaseEntity { @TableField("parse_name") @Comment("文件处理返回名称") private String parseName; + + + @Column(name = "draft_status") + @TableField("draft_status") + @Comment("资料审核状态") + private Integer draftStatus = DraftStatusEnum.NO_NEED.getValue(); + } diff --git a/src/main/java/com/project/information/domain/enums/DraftStatusEnum.java b/src/main/java/com/project/information/domain/enums/DraftStatusEnum.java new file mode 100644 index 0000000..2412094 --- /dev/null +++ b/src/main/java/com/project/information/domain/enums/DraftStatusEnum.java @@ -0,0 +1,18 @@ +package com.project.information.domain.enums; + +import com.project.base.domain.enums.HasValueEnum; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@RequiredArgsConstructor + +public enum DraftStatusEnum implements HasValueEnum { + NO_NEED(0, "无需审核"), + PENDING(1, "待审核"), + APPROVED(2, "审核通过"); + @Getter + private final Integer value; + + @Getter + private final String desc; +} diff --git a/src/main/java/com/project/task/domain/dto/TaskDTO.java b/src/main/java/com/project/task/domain/dto/TaskDTO.java index 6a02417..01b66cb 100644 --- a/src/main/java/com/project/task/domain/dto/TaskDTO.java +++ b/src/main/java/com/project/task/domain/dto/TaskDTO.java @@ -70,4 +70,16 @@ public class TaskDTO extends BaseDTO { private String taskUserStatus; + // =============== V1.1 新增字段 开始 ============ + + private Integer examMode; + + private Long classicPaperId; + + private Integer shortAnswerNum; + + private Double shortAnswerScore; + + // =============== V1.1 新增字段 结束 ============ + } diff --git a/src/main/java/com/project/task/domain/entity/TaskEntity.java b/src/main/java/com/project/task/domain/entity/TaskEntity.java index 20e7c90..6254e5f 100644 --- a/src/main/java/com/project/task/domain/entity/TaskEntity.java +++ b/src/main/java/com/project/task/domain/entity/TaskEntity.java @@ -150,4 +150,24 @@ public class TaskEntity extends BaseEntity { @Column(name = "need_ai_grading") @Comment("是否包含需要AI判分的题目") private Boolean needAiGrading = false; + // =============== V1.1 新增字段 开始 ============ + + @Column(name = "exam_mode") + @Comment("考试模式:0-生成式,1-经典套题") + private Integer examMode = 0; + + @Column(name = "classic_paper_id") + @Comment("绑定的经典套卷ID") + private Long classicPaperId; + + @Column(name = "short_answer_num") + @Comment("简答题数量") + private Integer shortAnswerNum = 0; + + @Column(name = "short_answer_score") + @Comment("简答题单题分值") + private Double shortAnswerScore = 0D; + + // =============== V1.1 新增字段 结束 ============ + } diff --git a/src/main/java/com/project/task/domain/enums/ExamModeEnum.java b/src/main/java/com/project/task/domain/enums/ExamModeEnum.java new file mode 100644 index 0000000..c95f1be --- /dev/null +++ b/src/main/java/com/project/task/domain/enums/ExamModeEnum.java @@ -0,0 +1,15 @@ +package com.project.task.domain.enums; + +import com.project.base.domain.enums.HasValueEnum; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@RequiredArgsConstructor +@Getter +public enum ExamModeEnum implements HasValueEnum { + GENERATIVE(0, "生成式套题"), // 生成式套题 + CLASSIC(1, "经典套题"); // 经典套题 + + private final Integer value; + private final String desc; +} diff --git a/src/main/java/com/project/task/domain/enums/QuestionTypeEnum.java b/src/main/java/com/project/task/domain/enums/QuestionTypeEnum.java index 04b7989..0a3ca72 100644 --- a/src/main/java/com/project/task/domain/enums/QuestionTypeEnum.java +++ b/src/main/java/com/project/task/domain/enums/QuestionTypeEnum.java @@ -5,12 +5,14 @@ import com.project.base.domain.enums.HasValueEnum; import lombok.Getter; import lombok.RequiredArgsConstructor; + @Getter @RequiredArgsConstructor public enum QuestionTypeEnum implements HasValueEnum { SINGLE_CHOICE(1, "单选题","single"), MULTIPLE_CHOICE(2, "多选题","multiple"), - TRUE_FALSE(3, "判断题","judgment"); + TRUE_FALSE(3, "判断题","judgment") , + SHORT_ANSWER(4, "简答题", "shortAnswer"); private final Integer value; private final String description;