Browse Source

新增出题模式和资料解析状态枚举

master
luoweijian 3 months ago
parent
commit
7c30fede6a
  1. 5
      src/main/java/com/project/information/domain/dto/InformationDTO.java
  2. 8
      src/main/java/com/project/information/domain/entity/InformationEntity.java
  3. 18
      src/main/java/com/project/information/domain/enums/DraftStatusEnum.java
  4. 12
      src/main/java/com/project/task/domain/dto/TaskDTO.java
  5. 20
      src/main/java/com/project/task/domain/entity/TaskEntity.java
  6. 15
      src/main/java/com/project/task/domain/enums/ExamModeEnum.java
  7. 4
      src/main/java/com/project/task/domain/enums/QuestionTypeEnum.java

5
src/main/java/com/project/information/domain/dto/InformationDTO.java

@ -1,10 +1,7 @@
package com.project.information.domain.dto; package com.project.information.domain.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.project.base.domain.dto.BaseDTO; import com.project.base.domain.dto.BaseDTO;
import jakarta.persistence.Column;
import lombok.Data; import lombok.Data;
import org.hibernate.annotations.Comment;
@Data @Data
public class InformationDTO extends BaseDTO { public class InformationDTO extends BaseDTO {
@ -18,6 +15,6 @@ public class InformationDTO extends BaseDTO {
private String fileSuffix; private String fileSuffix;
private String parseName; private String parseName;
private Integer draftStatus;
} }

8
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.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.project.base.domain.entity.BaseEntity; import com.project.base.domain.entity.BaseEntity;
import com.project.information.domain.enums.DraftStatusEnum;
import com.project.information.domain.enums.InformationParseStatusEnum; import com.project.information.domain.enums.InformationParseStatusEnum;
import jakarta.persistence.Column; import jakarta.persistence.Column;
import jakarta.persistence.Entity; import jakarta.persistence.Entity;
@ -53,4 +54,11 @@ public class InformationEntity extends BaseEntity {
@TableField("parse_name") @TableField("parse_name")
@Comment("文件处理返回名称") @Comment("文件处理返回名称")
private String parseName; private String parseName;
@Column(name = "draft_status")
@TableField("draft_status")
@Comment("资料审核状态")
private Integer draftStatus = DraftStatusEnum.NO_NEED.getValue();
} }

18
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<Integer> {
NO_NEED(0, "无需审核"),
PENDING(1, "待审核"),
APPROVED(2, "审核通过");
@Getter
private final Integer value;
@Getter
private final String desc;
}

12
src/main/java/com/project/task/domain/dto/TaskDTO.java

@ -70,4 +70,16 @@ public class TaskDTO extends BaseDTO {
private String taskUserStatus; private String taskUserStatus;
// =============== V1.1 新增字段 开始 ============
private Integer examMode;
private Long classicPaperId;
private Integer shortAnswerNum;
private Double shortAnswerScore;
// =============== V1.1 新增字段 结束 ============
} }

20
src/main/java/com/project/task/domain/entity/TaskEntity.java

@ -150,4 +150,24 @@ public class TaskEntity extends BaseEntity {
@Column(name = "need_ai_grading") @Column(name = "need_ai_grading")
@Comment("是否包含需要AI判分的题目") @Comment("是否包含需要AI判分的题目")
private Boolean needAiGrading = false; 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 新增字段 结束 ============
} }

15
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<Integer> {
GENERATIVE(0, "生成式套题"), // 生成式套题
CLASSIC(1, "经典套题"); // 经典套题
private final Integer value;
private final String desc;
}

4
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.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@Getter @Getter
@RequiredArgsConstructor @RequiredArgsConstructor
public enum QuestionTypeEnum implements HasValueEnum<Integer> { public enum QuestionTypeEnum implements HasValueEnum<Integer> {
SINGLE_CHOICE(1, "单选题","single"), SINGLE_CHOICE(1, "单选题","single"),
MULTIPLE_CHOICE(2, "多选题","multiple"), MULTIPLE_CHOICE(2, "多选题","multiple"),
TRUE_FALSE(3, "判断题","judgment"); TRUE_FALSE(3, "判断题","judgment") ,
SHORT_ANSWER(4, "简答题", "shortAnswer");
private final Integer value; private final Integer value;
private final String description; private final String description;

Loading…
Cancel
Save