From a1b0f938832dd36eddc66fe2b92ea32ba26dee7d Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期五, 07 六月 2024 15:53:42 +0800 Subject: [PATCH] 模板、试卷增删改查 --- src/main/java/com/ycl/jxkg/domain/vo/ExamTemplateVO.java | 43 +++++++------------------------------------ 1 files changed, 7 insertions(+), 36 deletions(-) diff --git a/src/main/java/com/ycl/jxkg/domain/vo/ExamTemplateVO.java b/src/main/java/com/ycl/jxkg/domain/vo/ExamTemplateVO.java index b887805..d5ac1b7 100644 --- a/src/main/java/com/ycl/jxkg/domain/vo/ExamTemplateVO.java +++ b/src/main/java/com/ycl/jxkg/domain/vo/ExamTemplateVO.java @@ -1,11 +1,14 @@ package com.ycl.jxkg.domain.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ycl.jxkg.domain.base.AbsVo; import com.ycl.jxkg.domain.entity.ExamTemplate; import java.math.BigDecimal; import java.util.Date; import java.util.List; + +import com.ycl.jxkg.domain.question.TemplateQuestionDTO; import org.springframework.lang.NonNull; import org.springframework.beans.BeanUtils; import io.swagger.annotations.ApiModel; @@ -28,7 +31,7 @@ private Integer subjectId; /** 鎬诲垎 */ - private Integer score; + private BigDecimal score; /** 鏄惁绉佹湁 */ private String visibility; @@ -42,46 +45,14 @@ /** 澶氶�夎瘎鍒� */ private BigDecimal deductTypeScore; - /** 鍗曢�夐鏁伴噺 */ - private Integer singleChoice; - - /** 澶氶�夐鏁伴噺 */ - private Integer multipleChoice; - - /** 濉┖棰樻暟閲� */ - private Integer gapFilling; - - /** 鍒ゆ柇鏁伴噺 */ - private Integer trueFalse; - - /** 绠�绛旈鏁伴噺 */ - private Integer shortAnswer; - - /** 璁$畻棰樻暟閲� */ - private Integer calculation; - - /** 鍗曢�夋瘡棰樺垎鏁� */ - private BigDecimal singleScore; - - /** 澶氶�夋瘡棰樺垎鏁� */ - private BigDecimal multipleScore; - - /** 濉┖姣忛鍒嗘暟 */ - private BigDecimal gapScore; - - /** 鍒ゆ柇姣忛鍒嗘暟 */ - private BigDecimal trueFalseScore; - - /** 绠�绛旀瘡棰樺垎鏁� */ - private BigDecimal shortAnswerScore; - - /** 璁$畻姣忛鍒嗘暟 */ - private BigDecimal calculationScore; + /** 棰樼洰閰嶇疆 */ + private List<TemplateQuestionDTO> questionList; /** */ private Integer createUser; /** */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; public static ExamTemplateVO getVoByEntity(@NonNull ExamTemplate entity, ExamTemplateVO vo) { -- Gitblit v1.8.0