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/ExamPaperAnswer.java | 25 ++++++++++++++++++++----- 1 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/ycl/jxkg/domain/ExamPaperAnswer.java b/src/main/java/com/ycl/jxkg/domain/entity/ExamPaperAnswer.java similarity index 60% rename from src/main/java/com/ycl/jxkg/domain/ExamPaperAnswer.java rename to src/main/java/com/ycl/jxkg/domain/entity/ExamPaperAnswer.java index 8610a3c..d4e8c7a 100644 --- a/src/main/java/com/ycl/jxkg/domain/ExamPaperAnswer.java +++ b/src/main/java/com/ycl/jxkg/domain/entity/ExamPaperAnswer.java @@ -1,79 +1,94 @@ -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 lombok.Data; import java.io.Serializable; import java.util.Date; @Data -public class ExamPaperAnswer implements Serializable { +@TableName("t_exam_paper_answer") +public class ExamPaperAnswer extends AbsEntity { - private static final long serialVersionUID = -2143539181805283910L; - private Integer id; - + @TableField("exam_paper_id") private Integer examPaperId; /** * 璇曞嵎鍚嶇О */ + @TableField("paper_name") private String paperName; /** * 璇曞嵎绫诲瀷( 1鍥哄畾璇曞嵎 4.鏃舵璇曞嵎 6.浠诲姟璇曞嵎) */ + @TableField("paper_type") private Integer paperType; /** * 瀛︾ */ + @TableField("subject_id") private Integer subjectId; /** * 绯荤粺鍒ゅ畾寰楀垎 */ + @TableField("system_score") private Integer systemScore; /** * 鏈�缁堝緱鍒�(鍗冨垎鍒�) */ + @TableField("user_score") private Integer userScore; /** * 璇曞嵎鎬诲垎 */ + @TableField("paper_score") private Integer paperScore; /** * 鍋氬棰樼洰鏁伴噺 */ + @TableField("question_correct") private Integer questionCorrect; /** * 棰樼洰鎬绘暟閲� */ + @TableField("question_count") private Integer questionCount; /** * 鍋氶鏃堕棿(绉�) */ + @TableField("do_time") private Integer doTime; /** * 璇曞嵎鐘舵��(1寰呭垽鍒� 2瀹屾垚) */ + @TableField("status") private Integer status; /** * 瀛︾敓 */ + @TableField("create_user") private Integer createUser; /** * 鎻愪氦鏃堕棿 */ + @TableField("create_time") private Date createTime; + @TableField("task_exam_id") private Integer taskExamId; } -- Gitblit v1.8.0