From 33fdb033e0a6b5ef6b2f8ac5fc67ad8222e564e5 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 17 五月 2024 14:49:12 +0800
Subject: [PATCH] 下载文件接口,bug修改

---
 src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java |   27 +++++++++++++++++++++++----
 1 files changed, 23 insertions(+), 4 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 6881c2c..892f2e3 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java
@@ -25,7 +25,9 @@
 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;
 
 @RestController("AdminExamPaperController")
 @RequestMapping(value = "/api/admin/exam/paper")
@@ -46,6 +48,10 @@
 
     @RequestMapping(value = "/page", method = RequestMethod.POST)
     public RestResponse<PageInfo<ExamResponseVM>> pageList(@RequestBody ExamPaperPageRequestVM model) {
+        model.setDeptIds(isDeptAdmin() ? getAdminDeptIds() : null);
+        if (Objects.nonNull(model.getLevel())) {
+            model.setDeptIds(Collections.singletonList(model.getLevel()));
+        }
         model.setType("0");
         PageInfo<ExamPaper> pageInfo = examPaperService.page(model);
         PageInfo<ExamResponseVM> page = PageInfoHelper.copyMap(pageInfo, e -> {
@@ -87,11 +93,18 @@
         ExamPaper examPaper = examPaperService.savePaperFromVM(model, getCurrentUser());
         ExamPaperEditRequestVO newVM = examPaperService.examPaperToVM(examPaper.getId());
 
-        // 鍔犲叆寤舵椂闃熷垪锛屽畾鏃惰瘯鍗风粨鏉熸椂璁板綍缂鸿�冨鐢�
-        if (examPaper.getPaperType() == 4) {
-            examPaperService.addTimeTask(examPaper);
-        }
         return RestResponse.ok(newVM);
+    }
+
+    /**
+     * 琛ヨ��
+     * @param model 鏁版嵁
+     * @return 鎿嶄綔缁撴灉
+     */
+    @RequestMapping(value = "/missExam", method = RequestMethod.POST)
+    public RestResponse<String> missExam(@RequestBody ExamPaperEditRequestVM model) {
+        examPaperService.missExam(model);
+        return RestResponse.ok("鎿嶄綔鎴愬姛");
     }
 
     @RequestMapping(value = "/select/{id}", method = RequestMethod.POST)
@@ -116,4 +129,10 @@
         List<PaperExcelVO> list = examPaperService.getPaperExcelById(id);
         ExcelUtils.export(response,"涓汉缁冧範",list,PaperExcelVO.class);
     }
+
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    public RestResponse<List<ExamPaper>> list() {
+        List<Integer> deptIds = isDeptAdmin() ? getAdminDeptIds() : null;
+        return RestResponse.ok(examPaperService.list(deptIds));
+    }
 }

--
Gitblit v1.8.0