|
@@ -16,11 +16,7 @@ |
|
|
package cn.afterturn.easypoi.excel.export; |
|
|
package cn.afterturn.easypoi.excel.export; |
|
|
|
|
|
|
|
|
import java.lang.reflect.Field; |
|
|
import java.lang.reflect.Field; |
|
|
import java.util.ArrayList; |
|
|
|
|
|
import java.util.Arrays; |
|
|
|
|
|
import java.util.Collection; |
|
|
|
|
|
import java.util.Iterator; |
|
|
|
|
|
import java.util.List; |
|
|
|
|
|
|
|
|
import java.util.*; |
|
|
|
|
|
|
|
|
import cn.afterturn.easypoi.util.PoiMergeCellUtil; |
|
|
import cn.afterturn.easypoi.util.PoiMergeCellUtil; |
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
import org.apache.commons.lang3.StringUtils; |
|
@@ -207,6 +203,12 @@ public class ExcelExportService extends BaseExportService { |
|
|
// 重复遍历,出现了重名现象,创建非指定的名称Sheet |
|
|
// 重复遍历,出现了重名现象,创建非指定的名称Sheet |
|
|
sheet = workbook.createSheet(); |
|
|
sheet = workbook.createSheet(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (dataSet.getClass().getClass().getName().contains("Unmodifiable") ){ |
|
|
|
|
|
List dataTemp = new ArrayList<>(); |
|
|
|
|
|
dataTemp.addAll(dataSet); |
|
|
|
|
|
dataSet = dataTemp; |
|
|
|
|
|
} |
|
|
insertDataToSheet(workbook, entity, entityList, dataSet, sheet); |
|
|
insertDataToSheet(workbook, entity, entityList, dataSet, sheet); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|