From 03a9cd21c1589e98978dc7296bb7fb48f1dcd7fe Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期五, 17 五月 2024 16:13:45 +0800
Subject: [PATCH] feat：创建试卷时新增选择用户查询条件
---
src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java b/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java
index 892f2e3..1cc4a82 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java
@@ -6,6 +6,7 @@
import com.mindskip.xzs.domain.ExamPaper;
import com.mindskip.xzs.domain.ExamPaperSubject;
import com.mindskip.xzs.domain.vo.PaperExcelVO;
+import com.mindskip.xzs.domain.vo.UserVO;
import com.mindskip.xzs.service.ExamPaperDepartmentService;
import com.mindskip.xzs.service.ExamPaperService;
import com.mindskip.xzs.service.ExamPaperSubjectService;
@@ -24,7 +25,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
-import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
@@ -84,12 +84,12 @@
@RequestMapping(value = "/edit", method = RequestMethod.POST)
public RestResponse<ExamPaperEditRequestVO> edit(@RequestBody @Valid ExamPaperEditRequestVM model) throws Exception {
- Object[] obj = Arrays.stream(model.getUserIds()).sorted().distinct().toArray();
- Integer[] userIds = new Integer[obj.length];
- for(int i = 0;i<obj.length;i++) {
- userIds[i] = (Integer)obj[i];
- }
- model.setUserIds(userIds);
+ // Object[] obj = Arrays.stream(model.getUserIds()).sorted().distinct().toArray();
+ // Integer[] userIds = new Integer[obj.length];
+ // for(int i = 0;i<obj.length;i++) {
+ // userIds[i] = (Integer)obj[i];
+ // }
+ // model.setUserIds(userIds);
ExamPaper examPaper = examPaperService.savePaperFromVM(model, getCurrentUser());
ExamPaperEditRequestVO newVM = examPaperService.examPaperToVM(examPaper.getId());
@@ -135,4 +135,9 @@
List<Integer> deptIds = isDeptAdmin() ? getAdminDeptIds() : null;
return RestResponse.ok(examPaperService.list(deptIds));
}
+
+ @RequestMapping(value = "/selectStudent", method = RequestMethod.POST)
+ public RestResponse<PageInfo<UserVO>> selectStudent(@RequestBody UserVO userVO) {
+ return RestResponse.ok(examPaperService.selectStudent(userVO));
+ }
}
--
Gitblit v1.8.0