From 008be75ef25dd2c7e8553fe79ec25722f4c2ea48 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 31 五月 2024 14:53:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ycl/jxkg/domain/entity/Question.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/domain/Question.java b/src/main/java/com/ycl/jxkg/domain/entity/Question.java
similarity index 70%
rename from src/main/java/com/ycl/jxkg/domain/Question.java
rename to src/main/java/com/ycl/jxkg/domain/entity/Question.java
index 0a004e4..b5116d8 100644
--- a/src/main/java/com/ycl/jxkg/domain/Question.java
+++ b/src/main/java/com/ycl/jxkg/domain/entity/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();
--
Gitblit v1.8.0