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/controller/admin/ExamPaperController.java    |   28 +
 src/main/java/com/ycl/jxkg/excel/CurrencyDataListener.java              |  105 +++++++
 src/main/java/com/ycl/jxkg/excel/SelectExcel.java                       |   77 +++++
 src/main/resources/mapper/QuestionMapper.xml                            |   39 ++
 src/main/java/com/ycl/jxkg/enums/QuestionTypeEnum.java                  |   13 
 src/main/java/com/ycl/jxkg/excel/DynamicMergeCellStrategy.java          |   44 +++
 src/main/java/com/ycl/jxkg/service/ExamPaperService.java                |   26 +
 src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java        |   11 
 src/main/java/com/ycl/jxkg/excel/FixedMergeCellStrategy.java            |   45 +++
 src/main/java/com/ycl/jxkg/mapper/QuestionMapper.java                   |    7 
 src/main/java/com/ycl/jxkg/domain/vo/admin/exam/OptionAndValueVO.java   |   20 +
 src/main/java/com/ycl/jxkg/domain/vo/admin/exam/QuestionExportVO.java   |   18 +
 src/main/java/com/ycl/jxkg/domain/vo/admin/exam/QuestionImportVO.java   |   79 +++++
 src/main/java/com/ycl/jxkg/domain/vo/admin/exam/QuestionExportData.java |   60 ++++
 src/main/java/com/ycl/jxkg/service/QuestionService.java                 |   10 
 src/main/java/com/ycl/jxkg/excel/RowItem.java                           |   16 +
 src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java       |  242 ++++++++++++++++
 17 files changed, 822 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java b/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java
index 09d7409..7165840 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java
@@ -1,26 +1,30 @@
 package com.ycl.jxkg.controller.admin;
 
+import com.alibaba.fastjson.JSON;
+import com.github.pagehelper.PageInfo;
 import com.ycl.jxkg.base.BaseApiController;
 import com.ycl.jxkg.base.Result;
 import com.ycl.jxkg.domain.entity.ExamPaper;
 import com.ycl.jxkg.domain.entity.ExamPaperQuestion;
 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.enums.VisibilityEnum;
 import com.ycl.jxkg.group.Add;
 import com.ycl.jxkg.group.Update;
 import com.ycl.jxkg.mapper.ExamPaperMapper;
 import com.ycl.jxkg.service.ExamPaperQuestionService;
 import com.ycl.jxkg.service.ExamPaperService;
-import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperPageRequestVO;
-import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperEditRequestVO;
-import com.ycl.jxkg.domain.vo.admin.exam.ExamResponseVO;
-import com.github.pagehelper.PageInfo;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.Date;
 import java.util.List;
 
@@ -88,4 +92,20 @@
         List<ExamPaper> list = examPaperService.myExamPaper(paperType);
         return Result.ok(list);
     }
+
+    @GetMapping("/download/importTemplate")
+    public void importTemplate(HttpServletResponse response) {
+        examPaperService.importTemplate(response);
+    }
+
+    @PostMapping("/export")
+    public void export(@RequestBody QuestionExportVO query, HttpServletResponse response) {
+        examPaperService.export(query, response);
+    }
+
+    @PostMapping("/import")
+    public Result importPaper(@RequestParam("file") MultipartFile file, @RequestParam("examPaper") String form) {
+        return examPaperService.importPaper(file, JSON.parseObject(form, ExamPaperForm.class));
+    }
+
 }
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/admin/exam/OptionAndValueVO.java b/src/main/java/com/ycl/jxkg/domain/vo/admin/exam/OptionAndValueVO.java
new file mode 100644
index 0000000..56fc92c
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/domain/vo/admin/exam/OptionAndValueVO.java
@@ -0,0 +1,20 @@
+package com.ycl.jxkg.domain.vo.admin.exam;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+/**
+ * 棰樼洰閫夐」
+ *
+ * @author锛歺p
+ * @date锛�2024/3/15 22:53
+ */
+@Data
+public class OptionAndValueVO {
+
+    @ExcelProperty({"棰樼洰閫夐」", "閫夐」"})
+    private String optionName;
+
+    @ExcelProperty({"棰樼洰閫夐」", "閫夐」鍊�"})
+    private String optionValue;
+}
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/admin/exam/QuestionExportData.java b/src/main/java/com/ycl/jxkg/domain/vo/admin/exam/QuestionExportData.java
new file mode 100644
index 0000000..a10d495
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/domain/vo/admin/exam/QuestionExportData.java
@@ -0,0 +1,60 @@
+package com.ycl.jxkg.domain.vo.admin.exam;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author锛歺p
+ * @date锛�2024/7/2 14:05
+ */
+@Data
+public class QuestionExportData {
+
+    @ExcelIgnore
+    private Integer id;
+
+    @ExcelIgnore
+    private String content;
+
+    @ExcelIgnore
+    private List<String> subjectList;
+
+    @ExcelProperty(value = "棰樺瀷")
+    private String questionType;
+
+    @ExcelProperty(value = "璇剧洰")
+    @ColumnWidth(30)
+    private String subject;
+
+    @ExcelProperty(value = "棰樺共")
+    @ColumnWidth(40)
+    private String title;
+
+    @ExcelProperty(value = "閫夐」A")
+    @ColumnWidth(40)
+    private String optionA;
+
+    @ColumnWidth(40)
+    @ExcelProperty(value = "閫夐」B")
+    private String optionB;
+
+    @ColumnWidth(40)
+    @ExcelProperty(value = "閫夐」C")
+    private String optionC;
+
+    @ColumnWidth(40)
+    @ExcelProperty(value = "閫夐」D")
+    private String optionD;
+
+    @ColumnWidth(120)
+    @ExcelProperty(value = "瑙f瀽")
+    private String analyze;
+
+    @ColumnWidth(10)
+    @ExcelProperty(value = "绛旀")
+    private String answer;
+}
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/admin/exam/QuestionExportVO.java b/src/main/java/com/ycl/jxkg/domain/vo/admin/exam/QuestionExportVO.java
new file mode 100644
index 0000000..2ee8d86
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/domain/vo/admin/exam/QuestionExportVO.java
@@ -0,0 +1,18 @@
+package com.ycl.jxkg.domain.vo.admin.exam;
+
+import lombok.Data;
+
+/**
+ * @author锛歺p
+ * @date锛�2024/3/28 16:40
+ */
+@Data
+public class QuestionExportVO {
+
+    /**
+     * 璇曞嵎
+     */
+    private Integer examPaperId;
+
+
+}
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/admin/exam/QuestionImportVO.java b/src/main/java/com/ycl/jxkg/domain/vo/admin/exam/QuestionImportVO.java
new file mode 100644
index 0000000..0275355
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/domain/vo/admin/exam/QuestionImportVO.java
@@ -0,0 +1,79 @@
+package com.ycl.jxkg.domain.vo.admin.exam;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum;
+import com.alibaba.excel.enums.poi.VerticalAlignmentEnum;
+import lombok.Data;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
+
+/**
+ * @author gonghl
+ * @since 2024-7-4
+ */
+@Data
+@ColumnWidth(20)
+@ContentStyle(horizontalAlignment = HorizontalAlignmentEnum.CENTER, verticalAlignment = VerticalAlignmentEnum.CENTER)
+public class QuestionImportVO {
+
+    @ExcelProperty("鏍囬")
+    private String label;
+
+    @ExcelProperty("棰樼洰绫诲瀷")
+    private String questionType;
+
+    @ExcelProperty("绉戠洰")
+    private String subject;
+
+    @ExcelIgnore
+    private List<Integer> subjectIds;
+    @ExcelIgnore
+    private List<String> subjectList;
+
+    @ColumnWidth(80)
+    @ExcelProperty("棰樺共")
+    private String title;
+
+    /** 棰樼洰鍐呭 **/
+    @ExcelIgnore
+    private String questionContent;
+
+    /** 閫夐」鍐呭 **/
+    @ExcelProperty({"棰樼洰閫夐」", "閫夐」"})
+    private String optionName;
+
+    @ExcelProperty({"棰樼洰閫夐」", "閫夐」鍊�"})
+    private String optionValue;
+
+    @ExcelProperty("绛旀(澶氫釜鐢ㄣ�侀殧寮�)")
+    private String correct;
+
+    /** 瑙f瀽 **/
+    @ColumnWidth(30)
+    @ExcelProperty("瑙f瀽")
+    private String analyze;
+
+    /** 棰樼洰鍒嗘暟 **/
+    @ExcelProperty("棰樼洰鍒嗘暟")
+    private Integer score;
+
+    /** 棰樼洰闅惧害 **/
+    @ExcelProperty("棰樼洰闅惧害")
+    private Integer difficult;
+
+    /**
+     * 杩斿洖璇ユ潯鏁版嵁鏄笉鏄锛屽洜涓鸿繕鏈夐�夐」銆傞�夐」鐨勮繖浜涘�兼槸绌虹殑
+     */
+    public boolean master() {
+        return StringUtils.hasText(questionType) && StringUtils.hasText(label);
+    }
+
+    public boolean intact() {
+        return StringUtils.hasText(title) && StringUtils.hasText(correct);
+    }
+
+}
diff --git a/src/main/java/com/ycl/jxkg/enums/QuestionTypeEnum.java b/src/main/java/com/ycl/jxkg/enums/QuestionTypeEnum.java
index 2be650a..1f9370a 100644
--- a/src/main/java/com/ycl/jxkg/enums/QuestionTypeEnum.java
+++ b/src/main/java/com/ycl/jxkg/enums/QuestionTypeEnum.java
@@ -54,6 +54,17 @@
         return name;
     }
 
-
+    public static Integer get(String text){
+        if("".equals(text) || text == null){
+            return null;
+        }
+        QuestionTypeEnum[] enums = QuestionTypeEnum.values();
+        for (QuestionTypeEnum anEnum : enums) {
+            if(anEnum.getName().equals(text)){
+                return anEnum.getCode();
+            }
+        }
+        return null;
+    }
 
 }
diff --git a/src/main/java/com/ycl/jxkg/excel/CurrencyDataListener.java b/src/main/java/com/ycl/jxkg/excel/CurrencyDataListener.java
new file mode 100644
index 0000000..074721f
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/excel/CurrencyDataListener.java
@@ -0,0 +1,105 @@
+package com.ycl.jxkg.excel;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.metadata.data.ReadCellData;
+import com.alibaba.excel.read.listener.ReadListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
+
+/**
+ * easyExcel 澶氳〃閫氱敤璇诲彇鐩戝惉鍣�
+ *
+ * @author xp
+ */
+public class CurrencyDataListener<T> implements ReadListener<T> {
+
+
+    private Consumer consumer;
+
+    /**
+     * 姣忛殧100鏉″瓨鍌ㄦ暟鎹簱锛岀劧鍚庢竻鐞唋ist 锛屾柟渚垮唴瀛樺洖鏀�
+     */
+    private static final int BATCH_COUNT = 100;
+
+    /**
+     * 缂撳瓨鐨勬暟鎹�
+     */
+    private List<T> cachedDataList = new ArrayList<>(BATCH_COUNT);
+
+    private final static Logger log = LoggerFactory.getLogger(CurrencyDataListener.class);
+
+    public CurrencyDataListener(Consumer<List<T>> consumer) {
+        this.consumer = consumer;
+    }
+
+    /**
+     * 璇诲彇鍑虹幇寮傚父澶勭悊
+     *
+     * @param e
+     * @param analysisContext
+     * @throws Exception
+     */
+    @Override
+    public void onException(Exception e, AnalysisContext analysisContext) throws Exception {
+
+    }
+
+    /**
+     * 澶勭悊琛ㄥご
+     *  @param map
+     * @param analysisContext
+     */
+    @Override
+    public void invokeHead(Map<Integer, ReadCellData<?>> map, AnalysisContext analysisContext) {
+
+    }
+
+    /**
+     * 璇诲彇鏁版嵁,姣忎竴鏉℃暟鎹В鏋愰兘浼氭潵璋冪敤
+     *
+     * @param data
+     * @param analysisContext
+     */
+    @Override
+    public void invoke(T data, AnalysisContext analysisContext) {
+        cachedDataList.add(data);
+        // 杈惧埌BATCH_COUNT浜嗭紝闇�瑕佸幓瀛樺偍涓�娆℃暟鎹簱锛岄槻姝㈡暟鎹嚑涓囨潯鏁版嵁鍦ㄥ唴瀛橈紝瀹规槗OOM
+        if (cachedDataList.size() >= BATCH_COUNT) {
+            try {
+                // 蹇呴』瑕佹崟鑾峰紓甯革紝鍚﹀垯鍒楄〃涓嶄細娓呯┖
+                saveData();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            // 瀛樺偍瀹屾垚娓呯悊 list
+            cachedDataList = new ArrayList<>(BATCH_COUNT);
+        }
+    }
+
+    /**
+     * 璇诲彇瀹屾垚
+     *
+     * @param analysisContext
+     */
+    @Override
+    public void doAfterAllAnalysed(AnalysisContext analysisContext) {
+        saveData();
+        log.info("鎵�鏈夋暟鎹В鏋愬畬鎴愶紒");
+    }
+
+    @Override
+    public boolean hasNext(AnalysisContext analysisContext) {
+        return true;
+    }
+
+    private void saveData() {
+        log.info("{}鏉℃暟鎹紝寮�濮嬪瓨鍌ㄦ暟鎹簱锛�", cachedDataList.size());
+        consumer.accept(cachedDataList);
+        log.info("瀛樺偍鏁版嵁搴撴垚鍔燂紒");
+    }
+}
diff --git a/src/main/java/com/ycl/jxkg/excel/DynamicMergeCellStrategy.java b/src/main/java/com/ycl/jxkg/excel/DynamicMergeCellStrategy.java
new file mode 100644
index 0000000..9bd05b1
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/excel/DynamicMergeCellStrategy.java
@@ -0,0 +1,44 @@
+package com.ycl.jxkg.excel;
+
+import com.alibaba.excel.metadata.Head;
+import com.alibaba.excel.write.merge.AbstractMergeStrategy;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.util.CellRangeAddress;
+
+import java.util.List;
+
+/**
+ * @author锛歺p
+ * @date锛�2024/3/16 11:20
+ */
+public class DynamicMergeCellStrategy extends AbstractMergeStrategy {
+
+    /**
+     * 澶氬皯琛屽悎骞朵竴娆★紙璧峰浣嶇疆锛�
+     */
+    private List<RowItem> rowMergeList;
+
+    /**
+     * 鍝簺鍒楅渶瑕佸悎骞惰
+     */
+    private List<Integer> mergeWhichColumn;
+
+    public DynamicMergeCellStrategy(List<RowItem> rowMergeList, List<Integer> mergeWhichColumn) {
+        this.rowMergeList = rowMergeList;
+        this.mergeWhichColumn = mergeWhichColumn;
+    }
+
+    @Override
+    protected void merge(Sheet sheet, Cell cell, Head head, Integer relativeRowIndex) {
+        // 鍙湁鍗曞厓鏍肩殑琛屽垪鍦ㄥ悎骞惰寖鍥村唴鎵嶅悎骞�
+        if (mergeWhichColumn.contains(cell.getColumnIndex())) {
+            rowMergeList.stream().forEach(rowItem -> {
+                if (rowItem.getStart() <= relativeRowIndex && rowItem.getEnd() >= relativeRowIndex) {
+                    CellRangeAddress cellRangeAddress = new CellRangeAddress(rowItem.getStart(), rowItem.getEnd(), cell.getColumnIndex(), cell.getColumnIndex());
+                    sheet.addMergedRegionUnsafe(cellRangeAddress);
+                }
+            });
+        }
+    }
+}
diff --git a/src/main/java/com/ycl/jxkg/excel/FixedMergeCellStrategy.java b/src/main/java/com/ycl/jxkg/excel/FixedMergeCellStrategy.java
new file mode 100644
index 0000000..4d21ea0
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/excel/FixedMergeCellStrategy.java
@@ -0,0 +1,45 @@
+package com.ycl.jxkg.excel;
+
+import com.alibaba.excel.metadata.Head;
+import com.alibaba.excel.write.merge.AbstractMergeStrategy;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.util.CellRangeAddress;
+
+import java.util.List;
+
+/**
+ * @author锛歺p
+ * @date锛�2024/3/16 11:20
+ */
+public class FixedMergeCellStrategy extends AbstractMergeStrategy {
+
+    /**
+     * 璧峰浣嶇疆
+     */
+    private Integer startRow;
+
+    /**
+     * 鍚堝苟澶氬皯琛�
+     */
+    private Integer mergeRowNumber;
+
+    /**
+     * 鍝簺鍒楅渶瑕佸悎骞惰
+     */
+    private List<Integer> mergeWhichColumn;
+
+    public FixedMergeCellStrategy(Integer startRow, Integer mergeRowNumber, List<Integer> mergeWhichColumn) {
+        this.startRow = startRow;
+        this.mergeRowNumber = mergeRowNumber;
+        this.mergeWhichColumn = mergeWhichColumn;
+    }
+
+    @Override
+    protected void merge(Sheet sheet, Cell cell, Head head, Integer relativeRowIndex) {
+        for (Integer whichColumn : mergeWhichColumn) {
+            CellRangeAddress cellRangeAddress = new CellRangeAddress(startRow, startRow + mergeRowNumber - 1, whichColumn, whichColumn);
+            sheet.addMergedRegionUnsafe(cellRangeAddress);
+        }
+    }
+}
diff --git a/src/main/java/com/ycl/jxkg/excel/RowItem.java b/src/main/java/com/ycl/jxkg/excel/RowItem.java
new file mode 100644
index 0000000..1b4669c
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/excel/RowItem.java
@@ -0,0 +1,16 @@
+package com.ycl.jxkg.excel;
+
+import lombok.Data;
+
+/**
+ * @author锛歺p
+ * @date锛�2024/3/29 9:12
+ */
+@Data
+public class RowItem {
+
+    private Integer start;
+
+    private Integer end;
+
+}
diff --git a/src/main/java/com/ycl/jxkg/excel/SelectExcel.java b/src/main/java/com/ycl/jxkg/excel/SelectExcel.java
new file mode 100644
index 0000000..c4e8cde
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/excel/SelectExcel.java
@@ -0,0 +1,77 @@
+package com.ycl.jxkg.excel;
+
+import com.alibaba.excel.metadata.Head;
+import com.alibaba.excel.metadata.data.WriteCellData;
+import com.alibaba.excel.write.handler.CellWriteHandler;
+import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
+import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddressList;
+
+import java.util.List;
+
+/**
+ * 璁剧疆easy-excel涓嬫媺澶勭悊鍣�
+ *
+ * @author锛歺p
+ * @date锛�2024/3/15 17:27
+ */
+public class SelectExcel implements CellWriteHandler {
+
+    /**
+     * 棰樼洰绫诲瀷
+     */
+    private String[] questionTypeList = {"鍗曢�夐", "澶氶�夐", "鍒ゆ柇棰�"};
+    /**
+     * 璇剧洰
+     */
+    private List<String> subjectNameList;
+    /**
+     * 閫夐」涓嬫媺鏁版嵁
+     */
+    private String[] optionList = {"A","B","C","D","E","F","G","H"};
+
+    public SelectExcel(List subjectNameList) {
+        this.subjectNameList = subjectNameList;
+    }
+
+    @Override
+    public void afterCellDispose(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, List<WriteCellData<?>> cellDataList, Cell cell, Head head, Integer relativeRowIndex, Boolean isHead) {
+        // 鑾峰彇sheet瀵硅薄
+        Sheet sheet = writeSheetHolder.getSheet();
+
+
+        // 鑾峰彇鏁版嵁鏍¢獙helper锛宔xcel鐨勪笅鎷夊氨鏄�氳繃鏁版嵁鏍¢獙璁剧疆
+        DataValidationHelper dataValidationHelper = sheet.getDataValidationHelper();
+
+        // 璁剧疆棰樼洰涓嬫媺鑼冨洿锛岀涓�鍒楋紝1500琛屽唴
+        CellRangeAddressList questionTypeRange = new CellRangeAddressList(1, 1500, 0, 0);
+        // 娣诲姞棰樼洰涓嬫媺
+        DataValidationConstraint questionConstraint = dataValidationHelper.createExplicitListConstraint(questionTypeList);
+        DataValidation questionValidation = dataValidationHelper.createValidation(questionConstraint, questionTypeRange);
+        sheet.addValidationData(questionValidation);
+
+
+        // 璁剧疆璇剧洰涓嬫媺鑼冨洿锛岀2鍒楋紝1500琛屽唴
+        CellRangeAddressList subjectTypeRange = new CellRangeAddressList(1, 1500, 1, 1);
+        // 娣诲姞璇剧洰涓嬫媺
+        DataValidationConstraint subjectConstraint = dataValidationHelper.createExplicitListConstraint(subjectNameList.toArray((new String[0])));
+        DataValidation subjectValidation = dataValidationHelper.createValidation(subjectConstraint, subjectTypeRange);
+        sheet.addValidationData(subjectValidation);
+
+        // 璁剧疆閫夐」涓嬫媺鑼冨洿锛岀4鍒楋紝1500琛屽唴
+        CellRangeAddressList optionRange = new CellRangeAddressList(2, 1500, 3, 3);
+        // 娣诲姞閫夐」涓嬫媺
+        DataValidationConstraint optionConstraint = dataValidationHelper.createExplicitListConstraint(optionList);
+        DataValidation optionValidation = dataValidationHelper.createValidation(optionConstraint, optionRange);
+        sheet.addValidationData(optionValidation);
+
+        // 璁剧疆閫夐」涓嬫媺鑼冨洿锛岀4鍒楋紝1500琛屽唴
+        CellRangeAddressList answerRange = new CellRangeAddressList(2, 1500, 5, 5);
+        // 娣诲姞閫夐」涓嬫媺
+        DataValidationConstraint answerConstraint = dataValidationHelper.createExplicitListConstraint(optionList);
+        DataValidation answerValidation = dataValidationHelper.createValidation(answerConstraint, answerRange);
+        sheet.addValidationData(answerValidation);
+
+    }
+}
diff --git a/src/main/java/com/ycl/jxkg/mapper/QuestionMapper.java b/src/main/java/com/ycl/jxkg/mapper/QuestionMapper.java
index 69b35e1..124be48 100644
--- a/src/main/java/com/ycl/jxkg/mapper/QuestionMapper.java
+++ b/src/main/java/com/ycl/jxkg/mapper/QuestionMapper.java
@@ -1,9 +1,11 @@
 package com.ycl.jxkg.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ycl.jxkg.domain.other.KeyValue;
 import com.ycl.jxkg.domain.entity.Question;
+import com.ycl.jxkg.domain.other.KeyValue;
 import com.ycl.jxkg.domain.question.RandomQuestionDTO;
+import com.ycl.jxkg.domain.vo.admin.exam.QuestionExportVO;
+import com.ycl.jxkg.domain.vo.admin.exam.QuestionImportVO;
 import com.ycl.jxkg.domain.vo.admin.question.QuestionPageRequestVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -41,4 +43,7 @@
      * @return
      */
     List<Question> getRandomQuestion(@Param("subjectId") Integer subjectId, @Param("questionType") Integer questionType,@Param("difficult") Integer difficult, @Param("num") Integer num);
+
+    List<QuestionImportVO> export(@Param("query") QuestionExportVO query);
+
 }
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);
 }
diff --git a/src/main/java/com/ycl/jxkg/service/QuestionService.java b/src/main/java/com/ycl/jxkg/service/QuestionService.java
index 0f1c650..08822d8 100644
--- a/src/main/java/com/ycl/jxkg/service/QuestionService.java
+++ b/src/main/java/com/ycl/jxkg/service/QuestionService.java
@@ -1,10 +1,12 @@
 package com.ycl.jxkg.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.pagehelper.PageInfo;
 import com.ycl.jxkg.domain.entity.Question;
+import com.ycl.jxkg.domain.vo.admin.exam.QuestionExportVO;
+import com.ycl.jxkg.domain.vo.admin.exam.QuestionImportVO;
 import com.ycl.jxkg.domain.vo.admin.question.QuestionEditRequestVO;
 import com.ycl.jxkg.domain.vo.admin.question.QuestionPageRequestVO;
-import com.github.pagehelper.PageInfo;
 import com.ycl.jxkg.domain.vo.admin.question.QuestionResponseVO;
 
 import java.util.List;
@@ -32,5 +34,11 @@
      */
     Boolean updateStatus(QuestionResponseVO question);
 
+    /**
+     * 棰樼洰瀵煎嚭鏁版嵁
+     * @param query 鏌ヨ鏉′欢
+     * @return 棰樼洰
+     */
+    List<QuestionImportVO> export(QuestionExportVO query);
 
 }
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java
index 40b3d69..f641b8e 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java
@@ -1,9 +1,9 @@
 package com.ycl.jxkg.service.impl;
 
+import com.alibaba.excel.EasyExcel;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson2.JSONArray;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
@@ -13,6 +13,7 @@
 import com.ycl.jxkg.context.WebContext;
 import com.ycl.jxkg.domain.entity.ExamPaper;
 import com.ycl.jxkg.domain.entity.Question;
+import com.ycl.jxkg.domain.entity.Subject;
 import com.ycl.jxkg.domain.exam.PaperFixQuestionDTO;
 import com.ycl.jxkg.domain.exam.PaperQuestion;
 import com.ycl.jxkg.domain.exam.PaperQuestionSettingDTO;
@@ -22,16 +23,15 @@
 import com.ycl.jxkg.domain.question.QuestionItemObject;
 import com.ycl.jxkg.domain.question.QuestionObject;
 import com.ycl.jxkg.domain.question.RandomQuestionDTO;
-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.ExamPaperTitleItemVO;
-import com.ycl.jxkg.domain.vo.admin.exam.ExamResponseVO;
+import com.ycl.jxkg.domain.vo.admin.exam.*;
 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.ycl.jxkg.enums.ExamPaperTypeEnum;
 import com.ycl.jxkg.enums.QuestionTypeEnum;
 import com.ycl.jxkg.enums.VisibilityEnum;
+import com.ycl.jxkg.enums.general.StatusEnum;
+import com.ycl.jxkg.excel.*;
 import com.ycl.jxkg.mapper.ExamPaperMapper;
 import com.ycl.jxkg.mapper.QuestionMapper;
 import com.ycl.jxkg.service.ExamPaperService;
@@ -39,17 +39,20 @@
 import com.ycl.jxkg.service.SubjectService;
 import com.ycl.jxkg.service.TextContentService;
 import com.ycl.jxkg.utils.DateTimeUtil;
-import com.ycl.jxkg.utils.JsonUtil;
 import com.ycl.jxkg.utils.PageInfoHelper;
 import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
+import java.net.URLEncoder;
 import java.util.*;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 @Service
@@ -339,4 +342,229 @@
         });
         return list;
     }
+
+    @Override
+    @SneakyThrows
+    public void importTemplate(HttpServletResponse response) {
+        String fileName = URLEncoder.encode("璇曞嵎瀵煎叆妯℃澘", "UTF-8").replaceAll("\\+", "%20");
+        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
+
+        // 鏋勫缓妯℃澘鏍蜂緥鏁版嵁
+        List<QuestionImportVO> data = new ArrayList<>(8);
+        QuestionImportVO questionImportVO = new QuestionImportVO();
+        questionImportVO.setLabel("鏍囬1");
+        questionImportVO.setQuestionType("鍗曢�夐");
+        questionImportVO.setDifficult(2);
+        questionImportVO.setCorrect("A");
+        questionImportVO.setScore(2);
+        questionImportVO.setAnalyze("A鏄鐨�");
+        questionImportVO.setTitle("杩欐槸涓�閬撴祴璇曢鐩紝浣跨敤璇ユā鏉胯鍒犻櫎鎴栨浛鎹㈣繖閬撻");
+        questionImportVO.setOptionName("A");
+        questionImportVO.setOptionValue("閫夋垜");
+        data.add(questionImportVO);
+
+        QuestionImportVO questionImport1 = new QuestionImportVO();
+        questionImport1.setOptionName("B");
+        questionImport1.setOptionValue("閫塀");
+        data.add(questionImport1);
+
+        QuestionImportVO questionImport2 = new QuestionImportVO();
+        questionImport2.setOptionName("C");
+        questionImport2.setOptionValue("閫塁");
+        data.add(questionImport2);
+
+        QuestionImportVO questionImport3 = new QuestionImportVO();
+        questionImport3.setOptionName("D");
+        questionImport3.setOptionValue("閫塂");
+        data.add(questionImport3);
+
+        EasyExcel.write(response.getOutputStream(), QuestionImportVO.class)
+                .sheet("妯℃澘")
+                .registerWriteHandler(new FixedMergeCellStrategy(2, 4, Arrays.asList(2, 3, 6, 7, 8, 9)))
+                .registerWriteHandler(new FixedMergeCellStrategy(2, 20, Arrays.asList(0, 1)))
+                .doWrite(data);
+    }
+
+    @Override
+    @SneakyThrows
+    public void export(QuestionExportVO query, HttpServletResponse response) {
+        // 鏌ヨ瀵煎嚭鏁版嵁
+        List<QuestionImportVO> exportData = questionService.export(query);
+        // 鏋勫缓鏁版嵁
+        List<QuestionImportVO> exportList = new ArrayList<>(exportData.size() * 4);
+        // 琛屽悎骞惰鍒�
+        List<RowItem> mergeRowList = new ArrayList<>(exportData.size());
+        int j = 2;
+        for (QuestionImportVO data : exportData) {
+            QuestionObject questionContent = JSON.parseObject(data.getQuestionContent(), QuestionObject.class);
+
+            RowItem rowItem = new RowItem();
+            rowItem.setStart(j);
+            int end = j + questionContent.getQuestionItemObjects().size() - 1;
+            rowItem.setEnd(end);
+            mergeRowList.add(rowItem);
+            j = end + 1;
+            int i = 0;
+            for (QuestionItemObject option : questionContent.getQuestionItemObjects()) {
+                if (i == 0) {
+                    QuestionImportVO master = new QuestionImportVO();
+                    BeanUtils.copyProperties(data, master);
+                    if (org.springframework.util.StringUtils.hasText(data.getQuestionType())) {
+                        master.setQuestionType(QuestionTypeEnum.fromCode(Integer.valueOf(data.getQuestionType())).getName());
+                    }
+                    master.setOptionName(option.getPrefix());
+                    master.setOptionValue(option.getContent());
+                    master.setTitle(questionContent.getTitleContent());
+                    master.setAnalyze(questionContent.getAnalyze());
+                    master.setCorrect(data.getCorrect().replaceAll(",", "銆�"));
+                    BigDecimal score = BigDecimal.valueOf(master.getScore());
+                    master.setScore(score.divide(BigDecimal.TEN).intValue());
+                    exportList.add(master);
+                } else {
+                    QuestionImportVO optionItem = new QuestionImportVO();
+                    optionItem.setOptionName(option.getPrefix());
+                    optionItem.setOptionValue(option.getContent());
+                    exportList.add(optionItem);
+                }
+                i++;
+            }
+        }
+        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+        response.setCharacterEncoding("utf-8");
+        // 杩欓噷URLEncoder.encode鍙互闃叉涓枃涔辩爜 褰撶劧鍜宔asyexcel娌℃湁鍏崇郴
+        String fileName = URLEncoder.encode("棰樼洰瀵煎嚭鏁版嵁", "UTF-8").replaceAll("\\+", "%20");
+        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
+
+        // 鏌ュ嚭鎵�鏈夌殑璇剧洰锛坋xcel涓嬫媺鏁版嵁锛�
+        List<Subject> subjects = subjectService.list();
+        List<String> subjectNameList = subjects.stream().map(Subject::getName).collect(Collectors.toList());
+        EasyExcel.write(response.getOutputStream(), QuestionImportVO.class)
+                .sheet("棰樼洰瀵煎嚭鏁版嵁")
+                .registerWriteHandler(new SelectExcel(subjectNameList))
+                .registerWriteHandler(new DynamicMergeCellStrategy(mergeRowList, Arrays.asList(0, 1, 2, 5, 6, 7, 8)))
+                .doWrite(exportList);
+    }
+
+    @Override
+    @Transactional
+    @SneakyThrows
+    public Result importPaper(MultipartFile file, ExamPaperForm form) {
+        List<Subject> subjects = subjectService.list();
+        List<Integer> questionNum = new ArrayList<>();
+        List<Integer> totalScore = new ArrayList<>();
+        // 鎷垮埌璇曞嵎
+        ExamPaper examPaper = ExamPaperForm.getEntityByForm(form, null);
+        // 棰樼洰闆嗗悎鐢ㄤ簬鎵归噺淇濆瓨
+        ArrayList<Question> questions = new ArrayList<>();
+        // 涓�寮犺瘯鍗峰涓爣棰�
+        ArrayList<PaperFixQuestionDTO> list = new ArrayList<>();
+
+        Consumer<List<QuestionImportVO>> consumer = (data) -> {
+            // 寰幆姣忎竴琛�
+            for (int i = 0; i < data.size(); i++) {
+                // 璇诲彇鐨勯鐩�
+                QuestionImportVO excelQuestion = data.get(i);
+                String questionType = excelQuestion.getQuestionType();
+                String label = excelQuestion.getLabel();
+                // 鍒ゆ柇鏄惁鏍囬
+                if (excelQuestion.master()) {
+                    // 涓�涓爣棰樺涓鐩�
+                    ArrayList<PaperQuestion> paperQuestions = new ArrayList<>();
+                    // 寰幆棰樼洰
+                    while (Boolean.TRUE) {
+                        // 鏇存柊璇诲彇鐨勯鐩�
+                        excelQuestion = data.get(i);
+                        // 鍒ゆ柇鏄惁棰樼洰
+                        if (excelQuestion.intact()) {
+                            Question question = new Question();
+                            totalScore.add(excelQuestion.getScore());
+                            // 璇ラ鐨勯�夐」
+                            List<QuestionItemObject> options = new ArrayList<>(8);
+                            // 閫夐」鍐呭
+                            QuestionItemObject option = new QuestionItemObject();
+                            option.setPrefix(excelQuestion.getOptionName());
+                            option.setContent(excelQuestion.getOptionValue());
+                            options.add(option);
+                            // 寰幆閫夐」
+                            while (Boolean.TRUE) {
+                                // 鍒ゆ柇鏄惁鏄渶鍚庝竴鏉�
+                                if (i + 1 == data.size()) {
+                                    break;
+                                }
+                                QuestionImportVO nextQuestion = data.get(1 + i);
+                                if (nextQuestion.intact()) {
+                                    break;
+                                }
+                                QuestionItemObject nextOption = new QuestionItemObject();
+                                nextOption.setPrefix(nextQuestion.getOptionName());
+                                nextOption.setContent(nextQuestion.getOptionValue());
+                                options.add(nextOption);
+                                i++;
+                            }
+                            // 淇濆瓨棰樼洰鍐呭
+                            QuestionObject questionObject = new QuestionObject();
+                            questionObject.setQuestionItemObjects(options);
+                            questionObject.setAnalyze(excelQuestion.getAnalyze());
+                            questionObject.setTitleContent(excelQuestion.getTitle());
+                            questionObject.setCorrect(excelQuestion.getCorrect());
+                            question.setTitle(excelQuestion.getTitle());
+                            question.setContent(JSON.toJSONString(questionObject));
+                            question.setQuestionType(QuestionTypeEnum.get(excelQuestion.getQuestionType()));
+                            // 绛旀(澶氶�夐渶瑕佺敤銆佸垎鍓蹭繚瀛樺瓧绗︿覆鍒版暟鎹簱)
+                            String[] corrects = excelQuestion.getCorrect().split("銆�");
+                            if (corrects.length > 1) {
+                                question.setCorrect(String.join(",", corrects));
+                            } else {
+                                question.setCorrect(excelQuestion.getCorrect());
+                            }
+                            // 闅惧害
+                            question.setDifficult(excelQuestion.getDifficult());
+                            // 鍒涘缓浜�
+                            question.setCreateUser(2);
+                            question.setStatus(StatusEnum.ENABLE);
+                            question.setCreateTime(new Date());
+                            question.setDeleted(0);
+                            question.setQuestionType(QuestionTypeEnum.get(questionType));
+                            // 鏍规嵁绉戠洰鍚嶇О鑾峰彇id
+                            QuestionImportVO finalExcelQuestion = excelQuestion;
+                            question.setSubjectId(subjects.stream().filter(subject -> subject.getName().equals(finalExcelQuestion.getSubject())).findFirst().get().getId());
+                            questions.add(question);
+
+                            PaperQuestion paperQuestion = new PaperQuestion();
+                            BeanUtils.copyProperties(question, paperQuestion);
+                            paperQuestion.setItems(options);
+                            paperQuestion.setAnalyze(excelQuestion.getAnalyze());
+                            paperQuestion.setScore(BigDecimal.valueOf(excelQuestion.getScore()));
+                            paperQuestions.add(paperQuestion);
+                        }
+                        if (i + 1 == data.size() || data.get(i + 1).master()) {
+                            break;
+                        }
+                        i++;
+                    }
+                    // 缁勮璇曞嵎鍐呭
+                    PaperFixQuestionDTO paperFixQuestionDTO = new PaperFixQuestionDTO();
+                    paperFixQuestionDTO.setTitle(label);
+                    paperFixQuestionDTO.setQuestionType(QuestionTypeEnum.get(questionType));
+                    paperFixQuestionDTO.setQuestionList(paperQuestions);
+                    questionNum.add(paperQuestions.size());
+                    list.add(paperFixQuestionDTO);
+                }
+            }
+        };
+        EasyExcel.read(file.getInputStream(), QuestionImportVO.class, new CurrencyDataListener(consumer)).sheet("妯℃澘").doRead();
+        // 淇濆瓨棰樼洰
+        questionService.saveBatch(questions);
+        // 淇濆瓨璇曞嵎
+        examPaper.setContent(JSON.toJSONString(list));
+        examPaper.setVisibility(VisibilityEnum.fromCode(form.getVisibility()).getName());
+        examPaper.setCreateUser(2);
+        examPaper.setCreateTime(new Date());
+        Integer score = totalScore.stream().reduce(Integer::sum).orElse(0);
+        Integer num = questionNum.stream().reduce(Integer::sum).orElse(0);
+        examPaper.setScore(new BigDecimal(score));
+        examPaper.setNum(num);
+        examPaperMapper.insert(examPaper);
+        return Result.ok();
+    }
 }
diff --git a/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java
index 4a737c4..755ede6 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java
@@ -5,15 +5,17 @@
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ycl.jxkg.domain.entity.Question;
-import com.ycl.jxkg.enums.QuestionTypeEnum;
-import com.ycl.jxkg.enums.general.StatusEnum;
 import com.ycl.jxkg.domain.other.KeyValue;
 import com.ycl.jxkg.domain.question.QuestionItemObject;
 import com.ycl.jxkg.domain.question.QuestionObject;
+import com.ycl.jxkg.domain.vo.admin.exam.QuestionExportVO;
+import com.ycl.jxkg.domain.vo.admin.exam.QuestionImportVO;
 import com.ycl.jxkg.domain.vo.admin.question.QuestionEditItemVO;
 import com.ycl.jxkg.domain.vo.admin.question.QuestionEditRequestVO;
 import com.ycl.jxkg.domain.vo.admin.question.QuestionPageRequestVO;
 import com.ycl.jxkg.domain.vo.admin.question.QuestionResponseVO;
+import com.ycl.jxkg.enums.QuestionTypeEnum;
+import com.ycl.jxkg.enums.general.StatusEnum;
 import com.ycl.jxkg.mapper.QuestionMapper;
 import com.ycl.jxkg.service.QuestionService;
 import com.ycl.jxkg.utils.DateTimeUtil;
@@ -179,4 +181,9 @@
                 .update();
     }
 
+    @Override
+    public List<QuestionImportVO> export(QuestionExportVO query) {
+        return questionMapper.export(query);
+    }
+
 }
diff --git a/src/main/resources/mapper/QuestionMapper.xml b/src/main/resources/mapper/QuestionMapper.xml
index 250f3a0..dfb80da 100644
--- a/src/main/resources/mapper/QuestionMapper.xml
+++ b/src/main/resources/mapper/QuestionMapper.xml
@@ -118,4 +118,43 @@
         RAND()
         LIMIT #{num}
     </select>
+
+    <resultMap id="exportDataMap"  type="com.ycl.jxkg.domain.vo.admin.exam.QuestionExportData">
+        <result column="question_type" property="questionType"/>
+        <result column="title" property="title"/>
+        <result column="analyze" property="analyze"/>
+        <result column="content" property="content"/>
+        <result column="correct" property="answer"/>
+        <collection property="subjectList" column="id" ofType="string" select="selectSubjects"/>
+    </resultMap>
+
+    <resultMap id="exportMap" type="com.ycl.jxkg.domain.vo.admin.exam.QuestionImportVO">
+        <result column="question_type" property="questionType"/>
+        <result column="title" property="title"/>
+        <result column="analyze" property="analyze"/>
+        <result column="score" property="score"/>
+        <result column="difficult" property="difficult"/>
+        <result column="content" property="questionContent"/>
+        <result column="score" property="score"/>
+        <result column="correct" property="correct"/>
+        <collection property="subjectList" column="id" ofType="string" select="selectSubjects"/>
+    </resultMap>
+
+    <select id="export" resultMap="exportMap">
+        SELECT
+        DISTINCT
+        q.*, ttc.content
+        FROM
+        t_question q
+        INNER JOIN t_ex ttc on q.info_text_content_id = ttc.id AND q.deleted = 0
+        <where>
+            <if test="query.examPaperId != null">
+                AND tqs.subject_id IN
+                <foreach collection="query.subjectIds" open="(" separator="," close=")" item="subjectId">
+                    #{subjectId}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
 </mapper>

--
Gitblit v1.8.0