From 3c3c7cb06d7091d06109ad6076e9dcfd965356d9 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 05 六月 2024 15:40:08 +0800
Subject: [PATCH] 打包问题，正式数据备份
---
src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 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 9ad3081..37f60df 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java
@@ -5,6 +5,7 @@
import com.mindskip.xzs.base.RestResponse;
import com.mindskip.xzs.domain.ExamPaper;
import com.mindskip.xzs.domain.ExamPaperSubject;
+import com.mindskip.xzs.domain.vo.ExamTemplatesVO;
import com.mindskip.xzs.domain.vo.PaperExcelVO;
import com.mindskip.xzs.domain.vo.UserVO;
import com.mindskip.xzs.service.ExamPaperDepartmentService;
@@ -49,7 +50,7 @@
@RequestMapping(value = "/page", method = RequestMethod.POST)
public RestResponse<PageInfo<ExamResponseVM>> pageList(@RequestBody ExamPaperPageRequestVM model) {
- model.setDeptIds(ObjectUtils.isNotEmpty(model.getDeptIds()) ? model.getDeptIds() : getAdminDeptIds());
+// model.setDeptIds(ObjectUtils.isNotEmpty(model.getDeptIds()) ? model.getDeptIds() : getAdminDeptIds());
if (Objects.nonNull(model.getLevel())) {
model.setDeptIds(Collections.singletonList(model.getLevel()));
}
@@ -108,6 +109,17 @@
return RestResponse.ok("鎿嶄綔鎴愬姛");
}
+ /**
+ * 琛ヨ��
+ * @param model 鏁版嵁
+ * @return 鎿嶄綔缁撴灉
+ */
+ @RequestMapping(value = "/missExamByTemplateId", method = RequestMethod.POST)
+ public RestResponse<String> missExamByTemplateId(@RequestBody ExamTemplatesVO model) {
+ examPaperService.missExamByTemplateId(model);
+ return RestResponse.ok("鎿嶄綔鎴愬姛");
+ }
+
@RequestMapping(value = "/select/{id}", method = RequestMethod.POST)
public RestResponse<ExamPaperEditRequestVO> select(@PathVariable Integer id) {
ExamPaperEditRequestVO vm = examPaperService.examPaperToVM(id);
@@ -139,6 +151,12 @@
@RequestMapping(value = "/selectStudent", method = RequestMethod.POST)
public RestResponse<PageInfo<UserVO>> selectStudent(@RequestBody UserVO userVO) {
- return RestResponse.ok(examPaperService.selectStudent(userVO));
+ List<Integer> adminDeptIds = getAdminDeptIds();
+ return RestResponse.ok(examPaperService.selectStudent(userVO, adminDeptIds));
+ }
+
+ @RequestMapping(value = "/queryCondition", method = RequestMethod.GET)
+ public RestResponse<List<ExamPaper>> queryCondition() {
+ return RestResponse.ok(examPaperService.queryCondition());
}
}
--
Gitblit v1.8.0