From e40857210a448e805913ed66f3b378d2a501c58f Mon Sep 17 00:00:00 2001
From: qirong <2032486488@qq.com>
Date: 星期二, 20 六月 2023 17:51:47 +0800
Subject: [PATCH] 修改

---
 src/main/java/com/mindskip/xzs/viewmodel/admin/exam/ExamPaperEditRequestVM.java |   47 ++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/mindskip/xzs/viewmodel/admin/exam/ExamPaperEditRequestVM.java b/src/main/java/com/mindskip/xzs/viewmodel/admin/exam/ExamPaperEditRequestVM.java
index f46f888..8659e60 100644
--- a/src/main/java/com/mindskip/xzs/viewmodel/admin/exam/ExamPaperEditRequestVM.java
+++ b/src/main/java/com/mindskip/xzs/viewmodel/admin/exam/ExamPaperEditRequestVM.java
@@ -2,19 +2,23 @@
 
 
 
+import com.mindskip.xzs.domain.ExamPaperDepartment;
+import com.mindskip.xzs.domain.ExamPaperSubject;
+
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.util.List;
+import java.util.Map;
 
 
 public class ExamPaperEditRequestVM {
     private Integer id;
-    @NotNull
+//    @NotNull
     private Integer level;
-    @NotNull
-    private Integer subjectId;
+//    @NotNull
+    private Integer[] subjectId;
     @NotNull
     private Integer paperType;
     @NotBlank
@@ -29,6 +33,15 @@
     private List<ExamPaperTitleItemVM> titleItems;
 
     private String score;
+
+    //閮ㄩ棬ids
+    private Integer[] departmentIds;
+
+    private Map<Integer,Integer> subjectSource;
+
+    private Integer aggregateSource;
+
+
 
     public Integer getId() {
         return id;
@@ -46,11 +59,11 @@
         this.level = level;
     }
 
-    public Integer getSubjectId() {
+    public Integer[] getSubjectId() {
         return subjectId;
     }
 
-    public void setSubjectId(Integer subjectId) {
+    public void setSubjectId(Integer[] subjectId) {
         this.subjectId = subjectId;
     }
 
@@ -101,4 +114,28 @@
     public void setScore(String score) {
         this.score = score;
     }
+
+    public Integer[] getDepartmentIds() {
+        return departmentIds;
+    }
+
+    public void setDepartmentIds(Integer[] departmentIds) {
+        this.departmentIds = departmentIds;
+    }
+
+    public Map<Integer, Integer> getSubjectSource() {
+        return subjectSource;
+    }
+
+    public void setSubjectSource(Map<Integer, Integer> subjectSource) {
+        this.subjectSource = subjectSource;
+    }
+
+    public Integer getAggregateSource() {
+        return aggregateSource;
+    }
+
+    public void setAggregateSource(Integer aggregateSource) {
+        this.aggregateSource = aggregateSource;
+    }
 }

--
Gitblit v1.8.0