From 9dee3e46fdb59eb67b26f8c1958007025d1b7c29 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 01 七月 2024 13:13:49 +0800
Subject: [PATCH] 阅卷补充题目答案,开始考试分页bug，开始考试补充数据
---
src/main/java/com/ycl/jxkg/domain/form/ExamPaperForm.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 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 1055071..c6b8c37 100644
--- a/src/main/java/com/ycl/jxkg/domain/form/ExamPaperForm.java
+++ b/src/main/java/com/ycl/jxkg/domain/form/ExamPaperForm.java
@@ -1,16 +1,14 @@
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.question.TemplateQuestionDTO;
+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 io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.beans.BeanUtils;
import org.springframework.lang.NonNull;
@@ -47,12 +45,12 @@
/**
* 璇曞嵎鎬诲垎
*/
- private BigDecimal score;
+ private String score;
/**
* 棰樼洰鏁伴噺
*/
- private Integer questionCount;
+ private Integer num;
/**
* 寤鸿鏃堕暱(鍒嗛挓)
@@ -81,9 +79,14 @@
private BigDecimal deductTypeScore;
/**
- * 棰樼洰妯℃澘
+ * 棰樼洰閰嶇疆
* */
- private List<TemplateQuestionDTO> questionList;
+ private List<PaperQuestionSettingDTO> questionSetting;
+
+ /**
+ * 棰樼洰淇℃伅
+ * */
+ private List<PaperFixQuestionDTO> questionTitleList;
public static ExamPaper getEntityByForm(@NonNull ExamPaperForm form, ExamPaper entity) {
if(entity == null) {
--
Gitblit v1.8.0