Merge remote-tracking branch 'origin/master'

fuliqi

2024-05-31 008be75ef25dd2c7e8553fe79ec25722f4c2ea48

 src/main/java/com/ycl/jxkg/domain/entity/Question.java

File was renamed from src/main/java/com/ycl/jxkg/domain/Question.java
@@ -1,5 +1,8 @@
package com.ycl.jxkg.domain;
package com.ycl.jxkg.domain.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.jxkg.domain.base.AbsEntity;
import com.ycl.jxkg.domain.enums.QuestionTypeEnum;
import com.ycl.jxkg.utils.ExamUtil;
import lombok.Data;
@@ -9,64 +12,69 @@
import java.util.List;

@Data
public class Question implements Serializable {
@TableName("t_question")
public class Question extends AbsEntity {

    private static final long serialVersionUID = 8826266720383164363L;

    private Integer id;

    /**
     *    1.单选题 2.多选题 3.判断题 4.填空题 5.简答题
     */
    @TableField("question_type")
    private Integer questionType;

    /**
     * 学科
     */
    @TableField("subject_id")
    private Integer subjectId;

    /**
     * 题目总分(千分制)
     */
    @TableField("score")
    private Integer score;

    /**
     * 级别
     */
    @TableField("grade_level")
    private Integer gradeLevel;

    /**
     * 题目难度
     */
    @TableField("difficult")
    private Integer difficult;

    /**
     * 正确答案
     */
    @TableField("correct")
    private String correct;

    /**
     * 题目 填空、 题干、解析、答案等信息
     */
    @TableField("info_text_content_id")
    private Integer infoTextContentId;

    /**
     * 创建人
     */
    @TableField("create_user")
    private Integer createUser;

    /**
     * 1.正常
     */
    @TableField("status")
    private Integer status;

    /**
     * 创建时间
     */
    @TableField("create_time")
    private Date createTime;

    private Boolean deleted;


    public void setCorrectFromVM(String correct, List<String> correctArray) {
        int qType = this.getQuestionType();