From a6a3bb04cdaa334a2868d09b20518ed98575bccb Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 02 七月 2024 18:08:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/mindskip/xzs/viewmodel/admin/question/QuestionEditRequestVM.java |   80 ++++++++++++++++++++++++++++++++++-----
 1 files changed, 69 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/mindskip/xzs/viewmodel/admin/question/QuestionEditRequestVM.java b/src/main/java/com/mindskip/xzs/viewmodel/admin/question/QuestionEditRequestVM.java
index fec0308..86e1f68 100644
--- a/src/main/java/com/mindskip/xzs/viewmodel/admin/question/QuestionEditRequestVM.java
+++ b/src/main/java/com/mindskip/xzs/viewmodel/admin/question/QuestionEditRequestVM.java
@@ -1,6 +1,7 @@
 package com.mindskip.xzs.viewmodel.admin.question;
 
 
+import com.mindskip.xzs.domain.QuestionSubject;
 import org.hibernate.validator.constraints.Range;
 
 import javax.validation.Valid;
@@ -11,36 +12,51 @@
 public class QuestionEditRequestVM {
 
     private Integer id;
-//    1:鍗曢��
+
+    /** 棰樺瀷 */
     @NotNull
     private Integer questionType;
-//    骞寸骇瀛︾琛�
-    @NotNull
+
+    /** 璇剧洰 */
     private Integer subjectId;
-    //棰樺共
+
+    /** 棰樺共 */
     @NotBlank
     private String title;
 
+    /** 閮ㄩ棬ID */
+    private List<Integer> deptIds;
+
+    private String sbNames;
+
     private Integer gradeLevel;
-    //绛旀
+
+    /** 绛旀 */
     @Valid
     private List<QuestionEditItemVM> items;
-    //瑙ｆ瀽
-    @NotBlank
+
+    /** 瑙ｆ瀽 */
     private String analyze;
 
-    //澶氶」閫夋嫨棰樼瓟妗�
+    /** 澶氶�夐绛旀 */
     private List<String> correctArray;
-    //绛旀
+
+    /** 绛旀 */
     private String correct;
-    //鍒嗘暟
+
+    /** 棰樼洰鍒嗘暟 */
     @NotBlank
     private String score;
-    //闅惧害
+
+    /** 棰樼洰闅惧害 */
     @Range(min = 1, max = 5, message = "璇烽�夋嫨棰樼洰闅惧害")
     private Integer difficult;
 
     private Integer itemOrder;
+
+    private String department;
+
+    private List<QuestionSubject> questionSubjects;
 
 
     private String a;
@@ -48,6 +64,48 @@
     private String c;
     private String d;
 
+    public List<Integer> getDeptIds() {
+        return deptIds;
+    }
+
+    public void setDeptIds(List<Integer> deptIds) {
+        this.deptIds = deptIds;
+    }
+
+    public String getDepartment() {
+        return department;
+    }
+
+    public void setDepartment(String department) {
+        this.department = department;
+    }
+
+    public List<QuestionSubject> getQuestionSubjects() {
+        return questionSubjects;
+    }
+
+    public void setQuestionSubjects(List<QuestionSubject> questionSubjects) {
+        this.questionSubjects = questionSubjects;
+    }
+
+    public String getSbNames() {
+        return sbNames;
+    }
+
+    public void setSbNames(String sbNames) {
+        this.sbNames = sbNames;
+    }
+
+    private Integer[] subjectIds;
+
+    public Integer[] getSubjectIds() {
+        return subjectIds;
+    }
+
+    public void setSubjectIds(Integer[] subjectIds) {
+        this.subjectIds = subjectIds;
+    }
+
     public String getA() {
         return a;
     }

--
Gitblit v1.8.0