From 3179257af77acbc229fe873de7495e2d3f8dfb6e Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 05 七月 2024 13:36:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/main/java/com/ycl/jxkg/service/ExamPaperService.java |   26 ++++++++++++++++++++++++--
 1 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ycl/jxkg/service/ExamPaperService.java b/src/main/java/com/ycl/jxkg/service/ExamPaperService.java
index 6e19f57..b8f7f57 100644
--- a/src/main/java/com/ycl/jxkg/service/ExamPaperService.java
+++ b/src/main/java/com/ycl/jxkg/service/ExamPaperService.java
@@ -1,18 +1,20 @@
 package com.ycl.jxkg.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.pagehelper.PageInfo;
 import com.ycl.jxkg.base.Result;
 import com.ycl.jxkg.domain.entity.ExamPaper;
-import com.ycl.jxkg.domain.entity.User;
 import com.ycl.jxkg.domain.form.ExamPaperForm;
 import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperEditRequestVO;
 import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperPageRequestVO;
 import com.ycl.jxkg.domain.vo.admin.exam.ExamResponseVO;
+import com.ycl.jxkg.domain.vo.admin.exam.QuestionExportVO;
 import com.ycl.jxkg.domain.vo.student.dashboard.PaperFilter;
 import com.ycl.jxkg.domain.vo.student.dashboard.PaperInfo;
 import com.ycl.jxkg.domain.vo.student.exam.ExamPaperPageVO;
-import com.github.pagehelper.PageInfo;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 public interface ExamPaperService extends IService<ExamPaper> {
@@ -45,4 +47,24 @@
     Result addPaper(ExamPaperForm form);
 
     Result updateExamPaper(ExamPaperForm form);
+
+    /**
+     * 涓嬭浇瀵煎叆璇曞嵎妯℃澘
+     * @param response 鍝嶅簲
+     */
+    void importTemplate(HttpServletResponse response);
+
+    /**
+     * 瀵煎嚭璇曞嵎
+     * @param query 鏉′欢
+     * @param response 鍝嶅簲
+     */
+    void export(QuestionExportVO query, HttpServletResponse response);
+
+    /**
+     * 瀵煎叆璇曞嵎
+     * @param file 鏂囦欢
+     * @return 鎿嶄綔缁撴灉
+     */
+    Result importPaper(MultipartFile file, ExamPaperForm form);
 }

--
Gitblit v1.8.0