From 37279beff7ecc26a3b7333ad01c5274f17abd647 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期五, 14 六月 2024 15:44:35 +0800
Subject: [PATCH] refactor：成绩管理
---
src/main/java/com/ycl/jxkg/domain/form/ExamTemplateForm.java | 96 +++++++++++++----------------------------------
1 files changed, 27 insertions(+), 69 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 5e90b25..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,7 +1,9 @@
package com.ycl.jxkg.domain.form;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.jxkg.domain.base.AbsForm;
import com.ycl.jxkg.domain.entity.ExamTemplate;
+import com.ycl.jxkg.domain.question.TemplateQuestionDTO;
import com.ycl.jxkg.group.Add;
import com.ycl.jxkg.group.Update;
import io.swagger.annotations.ApiModel;
@@ -10,97 +12,53 @@
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.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
/**
* 闅忔満璇曞嵎妯℃澘琛ㄥ崟
*
- * @author 寮�鍙戜汉鍛樺悕瀛�
- * @since 2024-06-03
+ * @author flq
+ * @since 2024-06-05
*/
@Data
@ApiModel(value = "ExamTemplate琛ㄥ崟", description = "闅忔満璇曞嵎妯℃澘琛ㄥ崟")
public class ExamTemplateForm extends AbsForm {
- @NotBlank(message = "妯℃澘鍚嶇О涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("妯℃澘鍚嶇О")
+ @NotBlank(message = "妯℃澘鍚嶄笉鑳戒负绌�", groups = {Add.class, Update.class})
+ @ApiModelProperty("妯℃澘鍚�")
private String name;
- @NotNull(message = "璇曞嵎绉戠洰涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("璇曞嵎绉戠洰")
+ @NotNull (message = "瀛︾id涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("瀛︾id")
private Integer subjectId;
- @NotNull(message = "鑰冭瘯鏃堕暱(鍒嗛挓)涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("鑰冭瘯鏃堕暱(鍒嗛挓)")
+ @ApiModelProperty("鎬诲垎")
+ private BigDecimal score;
+
+ @ApiModelProperty("鏄惁绉佹湁")
+ private String visibility;
+
+ @Min(value = 1,message = "寤鸿鏃堕棿蹇呴』澶т簬0",groups = {Add.class, Update.class})
+ @ApiModelProperty("寤鸿鏃堕棿")
private Integer suggestTime;
- @NotNull(message = "鍗曢�夐鏁伴噺涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("鍗曢�夐鏁伴噺")
- private Integer singleChoice;
+ @ApiModelProperty("澶氶�夋墸鍒嗙被鍨�")
+ private Integer deductType;
- @NotNull(message = "澶氶�夐鏁伴噺涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("澶氶�夐鏁伴噺")
- private Integer multipleChoice;
+ @ApiModelProperty("澶氶�夋墸鍒�")
+ private BigDecimal deductTypeScore;
- @NotNull(message = "濉┖棰樻暟閲忎笉鑳戒负绌�", groups = {Add.class, Update.class})
- @ApiModelProperty("濉┖棰樻暟閲�")
- private Integer gapFilling;
+ @ApiModelProperty("棰樼洰妯℃澘")
+ private List<TemplateQuestionDTO> questionList;
- @NotNull(message = "鍒ゆ柇鏁伴噺涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("鍒ゆ柇鏁伴噺")
- private Integer trueFalse;
-
- @NotNull(message = "绠�绛旈鏁伴噺涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("绠�绛旈鏁伴噺")
- private Integer shortAnswer;
-
- @NotNull(message = "璁＄畻棰樻暟閲忎笉鑳戒负绌�", groups = {Add.class, Update.class})
- @ApiModelProperty("璁＄畻棰樻暟閲�")
- private Integer calculation;
-
- @NotNull(message = "璇曞嵎鎬诲垎涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("璇曞嵎鎬诲垎")
- private Integer score;
-
- @NotBlank(message = "澶氶�夐鎵ｅ垎鏂瑰紡涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("澶氶�夐鎵ｅ垎鏂瑰紡")
- private String deductType;
-
- @NotNull(message = "鍒涘缓浜轰笉鑳戒负绌�", groups = {Add.class, Update.class})
- @ApiModelProperty("鍒涘缓浜�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:dd")
+ private Date createTime;
private Integer createUser;
-
- @NotNull(message = "鍒涘缓鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("鍒涘缓鏃堕棿")
- private LocalDateTime createTime;
-
- @NotNull(message = "涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("")
- private BigDecimal singleScore;
-
- @NotNull(message = "涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("")
- private BigDecimal multipleScore;
-
- @NotNull(message = "涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("")
- private BigDecimal gapScore;
-
- @NotNull(message = "涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("")
- private BigDecimal trueFalseScore;
-
- @NotNull(message = "涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("")
- private BigDecimal shortAnswerScore;
-
- @NotNull(message = "涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("")
- private BigDecimal calculationScore;
-
public static ExamTemplate getEntityByForm(@NonNull ExamTemplateForm form, ExamTemplate entity) {
if(entity == null) {
entity = new ExamTemplate();
--
Gitblit v1.8.0