From 607b15cde6515d18de64a40e17c5aef7fcf24bcb Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期三, 12 六月 2024 17:51:30 +0800
Subject: [PATCH] fix:成绩管理
---
src/main/java/com/ycl/jxkg/domain/entity/ExamPaper.java | 52 ++++++++++++++--------------------------------------
1 files changed, 14 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/domain/entity/ExamPaper.java b/src/main/java/com/ycl/jxkg/domain/entity/ExamPaper.java
index 29a0b03..d5913af 100644
--- a/src/main/java/com/ycl/jxkg/domain/entity/ExamPaper.java
+++ b/src/main/java/com/ycl/jxkg/domain/entity/ExamPaper.java
@@ -2,10 +2,12 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.jxkg.domain.base.AbsEntity;
import lombok.Data;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
@Data
@@ -27,22 +29,16 @@
private Integer subjectId;
/**
- * 璇曞嵎绫诲瀷( 1鍥哄畾璇曞嵎 4.鏃舵璇曞嵎 6.浠诲姟璇曞嵎)
+ * 璇曞嵎绫诲瀷( 1鍥哄畾璇曞嵎 2.闅忓嵆璇曞嵎 3.闅忓簭璇曞嵎)
*/
@TableField("paper_type")
private Integer paperType;
/**
- * 骞寸骇
- */
- @TableField("grade_level")
- private Integer gradeLevel;
-
- /**
- * 璇曞嵎鎬诲垎(鍗冨垎鍒�)
+ * 璇曞嵎鎬诲垎
*/
@TableField("score")
- private Integer score;
+ private BigDecimal score;
/**
* 棰樼洰鏁伴噺
@@ -51,43 +47,17 @@
private Integer questionCount;
/**
- * 棰樼洰鍒嗘暟
- */
- @TableField("question_score")
- private Integer questionScore;
-
- /**
* 寤鸿鏃堕暱(鍒嗛挓)
*/
@TableField("suggest_time")
private Integer suggestTime;
- /**
- * 鏃舵璇曞嵎 寮�濮嬫椂闂�
- */
- @TableField("limit_start_time")
- private Date limitStartTime;
-
- /**
- * 鏃舵璇曞嵎 缁撴潫鏃堕棿
- */
- @TableField("limit_end_time")
- private Date limitEndTime;
-
- /**
- * 璇曞嵎妗嗘灦 鍐呭涓篔SON
- */
- @TableField("frame_text_content_id")
- private Integer frameTextContentId;
-
@TableField("create_user")
private Integer createUser;
@TableField("create_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
-
- @TableField("task_exam_id")
- private Integer taskExamId;
/**
* 鍙鎬э紝鍏紑/绉佹湁
@@ -96,8 +66,14 @@
private String visibility;
/**
- * 鎵e垎绫诲瀷
+ * 澶氶�夋墸鍒嗙被鍨�
* */
@TableField("deduct_type")
- private String deductType;
+ private Integer deductType;
+
+ /**
+ * 澶氶�夎瘎鍒嗗垎鏁�
+ * */
+ @TableField("deduct_type_score")
+ private BigDecimal deductTypeScore;
}
--
Gitblit v1.8.0