From c4fb8dcb2c143d855cbc3112dcdaac9e0fd5ea76 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 29 三月 2024 13:53:47 +0800
Subject: [PATCH] 题目导出
---
src/main/java/com/mindskip/xzs/excel/FixedMergeCellStrategy.java | 2 +-
src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java b/src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java
index 12cad20..aca34d0 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java
@@ -190,7 +190,7 @@
EasyExcel.write(response.getOutputStream(), QuestionImportVO.class)
.sheet("妯℃澘")
.registerWriteHandler(new SelectExcel(subjectNameList))
- .registerWriteHandler(new FixedMergeCellStrategy(2, 4, Arrays.asList(1, 2, 3, 6, 7, 8, 9)))
+ .registerWriteHandler(new FixedMergeCellStrategy(2, 4, Arrays.asList(0, 1, 2, 5, 6, 7, 8)))
.doWrite(data);
}
diff --git a/src/main/java/com/mindskip/xzs/excel/FixedMergeCellStrategy.java b/src/main/java/com/mindskip/xzs/excel/FixedMergeCellStrategy.java
index 3e3f68f..14cc823 100644
--- a/src/main/java/com/mindskip/xzs/excel/FixedMergeCellStrategy.java
+++ b/src/main/java/com/mindskip/xzs/excel/FixedMergeCellStrategy.java
@@ -38,7 +38,7 @@
@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 - 1, whichColumn - 1);
+ CellRangeAddress cellRangeAddress = new CellRangeAddress(startRow, startRow + mergeRowNumber - 1, whichColumn, whichColumn);
sheet.addMergedRegionUnsafe(cellRangeAddress);
}
}
--
Gitblit v1.8.0