From 9e3d47a16aa7b4ed4edbcc1a09ac5949aa8f8ff6 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 14 六月 2024 10:50:52 +0800
Subject: [PATCH] 定时保存临时试卷
---
src/main/java/com/ycl/jxkg/domain/form/ExamTemplateForm.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/domain/form/ExamTemplateForm.java b/src/main/java/com/ycl/jxkg/domain/form/ExamTemplateForm.java
index af2310f..65c4972 100644
--- a/src/main/java/com/ycl/jxkg/domain/form/ExamTemplateForm.java
+++ b/src/main/java/com/ycl/jxkg/domain/form/ExamTemplateForm.java
@@ -1,18 +1,20 @@
package com.ycl.jxkg.domain.form;
-import com.ycl.jxkg.domain.question.TemplateQuestionDTO;
-import com.ycl.jxkg.group.Update;
-import com.ycl.jxkg.group.Add;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.jxkg.domain.base.AbsForm;
import com.ycl.jxkg.domain.entity.ExamTemplate;
-import org.springframework.beans.BeanUtils;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import org.springframework.lang.NonNull;
+import com.ycl.jxkg.domain.question.TemplateQuestionDTO;
+import com.ycl.jxkg.group.Add;
+import com.ycl.jxkg.group.Update;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.beans.BeanUtils;
+import org.springframework.lang.NonNull;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -31,26 +33,32 @@
@ApiModelProperty("妯℃澘鍚�")
private String name;
- @NotNull(message = "瀛︾id涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @NotNull (message = "瀛︾id涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("瀛︾id")
private Integer subjectId;
@ApiModelProperty("鎬诲垎")
- private Integer score;
+ private BigDecimal score;
@ApiModelProperty("鏄惁绉佹湁")
private String visibility;
- @NotNull(message = "寤鸿鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @Min(value = 1,message = "寤鸿鏃堕棿蹇呴』澶т簬0",groups = {Add.class, Update.class})
@ApiModelProperty("寤鸿鏃堕棿")
private Integer suggestTime;
@ApiModelProperty("澶氶�夋墸鍒嗙被鍨�")
private Integer deductType;
+ @ApiModelProperty("澶氶�夋墸鍒�")
+ private BigDecimal deductTypeScore;
+
@ApiModelProperty("棰樼洰妯℃澘")
private List<TemplateQuestionDTO> questionList;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:dd")
+ private Date createTime;
+ private Integer createUser;
public static ExamTemplate getEntityByForm(@NonNull ExamTemplateForm form, ExamTemplate entity) {
if(entity == null) {
entity = new ExamTemplate();
--
Gitblit v1.8.0