From 8546b3d285af4235a0ef615a0c6e89486ae2c806 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 17 十月 2024 21:01:37 +0800
Subject: [PATCH] 达梦不支持value改为values
---
src/main/java/com/ycl/jxkg/domain/form/ExamPaperForm.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/domain/form/ExamPaperForm.java b/src/main/java/com/ycl/jxkg/domain/form/ExamPaperForm.java
index a80afc7..2fa35c0 100644
--- a/src/main/java/com/ycl/jxkg/domain/form/ExamPaperForm.java
+++ b/src/main/java/com/ycl/jxkg/domain/form/ExamPaperForm.java
@@ -1,12 +1,12 @@
package com.ycl.jxkg.domain.form;
-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 com.ycl.jxkg.domain.base.AbsForm;
import com.ycl.jxkg.domain.entity.ExamPaper;
-import com.ycl.jxkg.domain.entity.ExamTemplate;
+import com.ycl.jxkg.domain.exam.PaperFixQuestionDTO;
+import com.ycl.jxkg.domain.exam.PaperQuestion;
+import com.ycl.jxkg.domain.exam.PaperQuestionSettingDTO;
import com.ycl.jxkg.group.Add;
import com.ycl.jxkg.group.Update;
import lombok.Data;
@@ -18,6 +18,7 @@
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
@Data
@TableName("t_exam_paper")
@@ -30,12 +31,6 @@
private String name;
/**
- * 瀛︾
- */
- @NotNull(message = "瀛︾涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- private Integer subjectId;
-
- /**
* 璇曞嵎绫诲瀷( 1鍥哄畾璇曞嵎 2.闅忓嵆璇曞嵎 3.闅忓簭璇曞嵎)
*/
@NotNull (message = "璇曞嵎绫诲瀷涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@@ -44,12 +39,12 @@
/**
* 璇曞嵎鎬诲垎
*/
- private BigDecimal score;
+ private String score;
/**
* 棰樼洰鏁伴噺
*/
- private Integer questionCount;
+ private Integer num;
/**
* 寤鸿鏃堕暱(鍒嗛挓)
@@ -77,6 +72,16 @@
* */
private BigDecimal deductTypeScore;
+ /**
+ * 棰樼洰閰嶇疆
+ * */
+ private List<PaperQuestionSettingDTO> questionSetting;
+
+ /**
+ * 棰樼洰淇℃伅
+ * */
+ private List<PaperFixQuestionDTO> questionTitleList;
+
public static ExamPaper getEntityByForm(@NonNull ExamPaperForm form, ExamPaper entity) {
if(entity == null) {
entity = new ExamPaper();
--
Gitblit v1.8.0