opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-18 09:35:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pre Merge pull request !774 from miko/dev

Browse Source
This commit is contained in:
miko 2025-10-04 17:43:01 +00:00 committed by Gitee
commit c57a602821
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java
View File

@ -24,9 +24,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.function.Consumer;
/**
@ -36,6 +34,17 @@ import java.util.function.Consumer;
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class ExcelUtil {
private static final ThreadLocal<Set<String>> excludeFields = ThreadLocal.withInitial(HashSet::new);
public static void excludeFields(String... fields) {
excludeFields.remove();
Collections.addAll(excludeFields.get(), fields);
}
public static Set<String> getExcludeFields() {
return excludeFields.get();
}
/**
* 同步导入(适用于小数据量)
@ -195,6 +204,11 @@ public class ExcelUtil {
.registerConverter(new ExcelBigNumberConvert())
.registerWriteHandler(new DataWriteHandler(clazz))
.sheet(sheetName);
if(excludeFields.get()!=null && !excludeFields.get().isEmpty()){
builder.excludeColumnFieldNames(excludeFields.get());
excludeFields.remove();
}
if (merge) {
// 合并处理器
builder.registerWriteHandler(new CellMergeStrategy(list, true));