admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 优化 excel导出合并 在初始化类时进行数据的处理

Browse Source
This commit is contained in:
疯狂的狮子li 2023-05-23 13:45:11 +08:00
parent f687bde93b
commit b8e389bb7e
1 changed files with 65 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java
View File

@ -28,20 +28,19 @@ import java.util.Map;
@Slf4j @Slf4j
public class CellMergeStrategy extends AbstractMergeStrategy { public class CellMergeStrategy extends AbstractMergeStrategy {
private final List<?> list; private final List<CellRangeAddress> cellList;
private final boolean hasTitle; private final boolean hasTitle;
private int rowIndex; private int rowIndex;
public CellMergeStrategy(List<?> list, boolean hasTitle) { public CellMergeStrategy(List<?> list, boolean hasTitle) {
this.list = list;
this.hasTitle = hasTitle; this.hasTitle = hasTitle;
// 行合并开始下标 // 行合并开始下标
this.rowIndex = hasTitle ? 1 : 0; this.rowIndex = hasTitle ? 1 : 0;
this.cellList = handle(list, hasTitle);
} }
@Override @Override
protected void merge(Sheet sheet, Cell cell, Head head, Integer relativeRowIndex) { protected void merge(Sheet sheet, Cell cell, Head head, Integer relativeRowIndex) {
List<CellRangeAddress> cellList = handle(list, hasTitle);
// judge the list is not null // judge the list is not null
if (CollUtil.isNotEmpty(cellList)) { if (CollUtil.isNotEmpty(cellList)) {
// the judge is necessary // the judge is necessary