|
|
@ -194,6 +194,11 @@ public class ExcelUtil<T> |
|
|
*/ |
|
|
*/ |
|
|
public Class<T> clazz; |
|
|
public Class<T> clazz; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* 需要显示列属性 |
|
|
|
|
|
*/ |
|
|
|
|
|
public String[] includeFields; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 需要排除列属性 |
|
|
* 需要排除列属性 |
|
|
*/ |
|
|
*/ |
|
|
@ -204,11 +209,20 @@ public class ExcelUtil<T> |
|
|
this.clazz = clazz; |
|
|
this.clazz = clazz; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* 仅在Excel中显示列属性 |
|
|
|
|
|
* |
|
|
|
|
|
* @param fields 列属性名 示例[单个"name"/多个"id","name"] |
|
|
|
|
|
*/ |
|
|
|
|
|
public void showColumn(String... fields) |
|
|
|
|
|
{ |
|
|
|
|
|
this.includeFields = fields; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 隐藏Excel中列属性 |
|
|
* 隐藏Excel中列属性 |
|
|
* |
|
|
* |
|
|
* @param fields 列属性名 示例[单个"name"/多个"id","name"] |
|
|
* @param fields 列属性名 示例[单个"name"/多个"id","name"] |
|
|
* @throws Exception |
|
|
|
|
|
*/ |
|
|
*/ |
|
|
public void hideColumn(String... fields) |
|
|
public void hideColumn(String... fields) |
|
|
{ |
|
|
{ |
|
|
@ -238,8 +252,6 @@ public class ExcelUtil<T> |
|
|
{ |
|
|
{ |
|
|
if (StringUtils.isNotEmpty(title)) |
|
|
if (StringUtils.isNotEmpty(title)) |
|
|
{ |
|
|
{ |
|
|
subMergedFirstRowNum++; |
|
|
|
|
|
subMergedLastRowNum++; |
|
|
|
|
|
int titleLastCol = this.fields.size() - 1; |
|
|
int titleLastCol = this.fields.size() - 1; |
|
|
if (isSubList()) |
|
|
if (isSubList()) |
|
|
{ |
|
|
{ |
|
|
@ -250,7 +262,7 @@ public class ExcelUtil<T> |
|
|
Cell titleCell = titleRow.createCell(0); |
|
|
Cell titleCell = titleRow.createCell(0); |
|
|
titleCell.setCellStyle(styles.get("title")); |
|
|
titleCell.setCellStyle(styles.get("title")); |
|
|
titleCell.setCellValue(title); |
|
|
titleCell.setCellValue(title); |
|
|
sheet.addMergedRegion(new CellRangeAddress(titleRow.getRowNum(), titleRow.getRowNum(), titleRow.getRowNum(), titleLastCol)); |
|
|
sheet.addMergedRegion(new CellRangeAddress(titleRow.getRowNum(), titleRow.getRowNum(), 0, titleLastCol)); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -261,23 +273,31 @@ public class ExcelUtil<T> |
|
|
{ |
|
|
{ |
|
|
if (isSubList()) |
|
|
if (isSubList()) |
|
|
{ |
|
|
{ |
|
|
subMergedFirstRowNum++; |
|
|
|
|
|
subMergedLastRowNum++; |
|
|
|
|
|
Row subRow = sheet.createRow(rownum); |
|
|
Row subRow = sheet.createRow(rownum); |
|
|
int excelNum = 0; |
|
|
int column = 0; |
|
|
|
|
|
int subFieldSize = subFields != null ? subFields.size() : 0; |
|
|
for (Object[] objects : fields) |
|
|
for (Object[] objects : fields) |
|
|
{ |
|
|
{ |
|
|
|
|
|
Field field = (Field) objects[0]; |
|
|
Excel attr = (Excel) objects[1]; |
|
|
Excel attr = (Excel) objects[1]; |
|
|
Cell headCell1 = subRow.createCell(excelNum); |
|
|
if (Collection.class.isAssignableFrom(field.getType())) |
|
|
headCell1.setCellValue(attr.name()); |
|
|
{ |
|
|
headCell1.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor()))); |
|
|
Cell cell = subRow.createCell(column); |
|
|
excelNum++; |
|
|
cell.setCellValue(attr.name()); |
|
|
|
|
|
cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor()))); |
|
|
|
|
|
if (subFieldSize > 1) |
|
|
|
|
|
{ |
|
|
|
|
|
CellRangeAddress cellAddress = new CellRangeAddress(rownum, rownum, column, column + subFieldSize - 1); |
|
|
|
|
|
sheet.addMergedRegion(cellAddress); |
|
|
} |
|
|
} |
|
|
int headFirstRow = excelNum - 1; |
|
|
column += subFieldSize; |
|
|
int headLastRow = headFirstRow + subFields.size() - 1; |
|
|
} |
|
|
if (headLastRow > headFirstRow) |
|
|
else |
|
|
{ |
|
|
{ |
|
|
sheet.addMergedRegion(new CellRangeAddress(rownum, rownum, headFirstRow, headLastRow)); |
|
|
Cell cell = subRow.createCell(column++); |
|
|
|
|
|
cell.setCellValue(attr.name()); |
|
|
|
|
|
cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor()))); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
rownum++; |
|
|
rownum++; |
|
|
} |
|
|
} |
|
|
@ -290,11 +310,23 @@ public class ExcelUtil<T> |
|
|
* @return 转换后集合 |
|
|
* @return 转换后集合 |
|
|
*/ |
|
|
*/ |
|
|
public List<T> importExcel(InputStream is) |
|
|
public List<T> importExcel(InputStream is) |
|
|
|
|
|
{ |
|
|
|
|
|
return importExcel(is, 0); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* 对excel表单默认第一个索引名转换成list |
|
|
|
|
|
* |
|
|
|
|
|
* @param is 输入流 |
|
|
|
|
|
* @param titleNum 标题占用行数 |
|
|
|
|
|
* @return 转换后集合 |
|
|
|
|
|
*/ |
|
|
|
|
|
public List<T> importExcel(InputStream is, int titleNum) |
|
|
{ |
|
|
{ |
|
|
List<T> list = null; |
|
|
List<T> list = null; |
|
|
try |
|
|
try |
|
|
{ |
|
|
{ |
|
|
list = importExcel(is, 0); |
|
|
list = importExcel(StringUtils.EMPTY, is, titleNum); |
|
|
} |
|
|
} |
|
|
catch (Exception e) |
|
|
catch (Exception e) |
|
|
{ |
|
|
{ |
|
|
@ -308,18 +340,6 @@ public class ExcelUtil<T> |
|
|
return list; |
|
|
return list; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* 对excel表单默认第一个索引名转换成list |
|
|
|
|
|
* |
|
|
|
|
|
* @param is 输入流 |
|
|
|
|
|
* @param titleNum 标题占用行数 |
|
|
|
|
|
* @return 转换后集合 |
|
|
|
|
|
*/ |
|
|
|
|
|
public List<T> importExcel(InputStream is, int titleNum) throws Exception |
|
|
|
|
|
{ |
|
|
|
|
|
return importExcel(StringUtils.EMPTY, is, titleNum); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 对excel表单指定表格索引名转换成list |
|
|
* 对excel表单指定表格索引名转换成list |
|
|
* |
|
|
* |
|
|
@ -711,64 +731,91 @@ public class ExcelUtil<T> |
|
|
{ |
|
|
{ |
|
|
int startNo = index * sheetSize; |
|
|
int startNo = index * sheetSize; |
|
|
int endNo = Math.min(startNo + sheetSize, list.size()); |
|
|
int endNo = Math.min(startNo + sheetSize, list.size()); |
|
|
int rowNo = (1 + rownum) - startNo; |
|
|
int currentRowNum = rownum + 1; // 从标题行后开始
|
|
|
|
|
|
|
|
|
for (int i = startNo; i < endNo; i++) |
|
|
for (int i = startNo; i < endNo; i++) |
|
|
{ |
|
|
{ |
|
|
rowNo = isSubList() ? (i > 1 ? rowNo + 1 : rowNo + i) : i + 1 + rownum - startNo; |
|
|
row = sheet.createRow(currentRowNum); |
|
|
row = sheet.createRow(rowNo); |
|
|
|
|
|
// 得到导出对象.
|
|
|
|
|
|
T vo = (T) list.get(i); |
|
|
T vo = (T) list.get(i); |
|
|
Collection<?> subList = null; |
|
|
|
|
|
if (isSubList()) |
|
|
|
|
|
{ |
|
|
|
|
|
if (isSubListValue(vo)) |
|
|
|
|
|
{ |
|
|
|
|
|
subList = getListCellValue(vo); |
|
|
|
|
|
subMergedLastRowNum = subMergedLastRowNum + subList.size(); |
|
|
|
|
|
} |
|
|
|
|
|
else |
|
|
|
|
|
{ |
|
|
|
|
|
subMergedFirstRowNum++; |
|
|
|
|
|
subMergedLastRowNum++; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
int column = 0; |
|
|
int column = 0; |
|
|
|
|
|
int maxSubListSize = getCurrentMaxSubListSize(vo); |
|
|
for (Object[] os : fields) |
|
|
for (Object[] os : fields) |
|
|
{ |
|
|
{ |
|
|
Field field = (Field) os[0]; |
|
|
Field field = (Field) os[0]; |
|
|
Excel excel = (Excel) os[1]; |
|
|
Excel excel = (Excel) os[1]; |
|
|
if (Collection.class.isAssignableFrom(field.getType()) && StringUtils.isNotNull(subList)) |
|
|
if (Collection.class.isAssignableFrom(field.getType())) |
|
|
{ |
|
|
{ |
|
|
boolean subFirst = false; |
|
|
try |
|
|
for (Object obj : subList) |
|
|
|
|
|
{ |
|
|
{ |
|
|
if (subFirst) |
|
|
Collection<?> subList = (Collection<?>) getTargetValue(vo, field, excel); |
|
|
|
|
|
if (subList != null && !subList.isEmpty()) |
|
|
{ |
|
|
{ |
|
|
rowNo++; |
|
|
|
|
|
row = sheet.createRow(rowNo); |
|
|
|
|
|
} |
|
|
|
|
|
List<Field> subFields = FieldUtils.getFieldsListWithAnnotation(obj.getClass(), Excel.class); |
|
|
|
|
|
int subIndex = 0; |
|
|
int subIndex = 0; |
|
|
for (Field subField : subFields) |
|
|
for (Object subVo : subList) |
|
|
{ |
|
|
{ |
|
|
if (subField.isAnnotationPresent(Excel.class)) |
|
|
Row subRow = sheet.getRow(currentRowNum + subIndex); |
|
|
|
|
|
if (subRow == null) |
|
|
{ |
|
|
{ |
|
|
subField.setAccessible(true); |
|
|
subRow = sheet.createRow(currentRowNum + subIndex); |
|
|
Excel attr = subField.getAnnotation(Excel.class); |
|
|
} |
|
|
this.addCell(attr, row, (T) obj, subField, column + subIndex); |
|
|
|
|
|
|
|
|
int subColumn = column; |
|
|
|
|
|
for (Field subField : subFields) |
|
|
|
|
|
{ |
|
|
|
|
|
Excel subExcel = subField.getAnnotation(Excel.class); |
|
|
|
|
|
addCell(subExcel, subRow, (T) subVo, subField, subColumn++); |
|
|
} |
|
|
} |
|
|
subIndex++; |
|
|
subIndex++; |
|
|
} |
|
|
} |
|
|
subFirst = true; |
|
|
column += subFields.size(); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
catch (Exception e) |
|
|
|
|
|
{ |
|
|
|
|
|
log.error("填充集合数据失败", e); |
|
|
} |
|
|
} |
|
|
this.subMergedFirstRowNum = this.subMergedFirstRowNum + subList.size(); |
|
|
|
|
|
} |
|
|
} |
|
|
else |
|
|
else |
|
|
{ |
|
|
{ |
|
|
this.addCell(excel, row, vo, field, column++); |
|
|
// 创建单元格并设置值
|
|
|
|
|
|
addCell(excel, row, vo, field, column); |
|
|
|
|
|
if (maxSubListSize > 1 && excel.needMerge()) |
|
|
|
|
|
{ |
|
|
|
|
|
sheet.addMergedRegion(new CellRangeAddress(currentRowNum, currentRowNum + maxSubListSize - 1, column, column)); |
|
|
|
|
|
} |
|
|
|
|
|
column++; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
currentRowNum += maxSubListSize; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* 获取子列表最大数 |
|
|
|
|
|
*/ |
|
|
|
|
|
private int getCurrentMaxSubListSize(T vo) |
|
|
|
|
|
{ |
|
|
|
|
|
int maxSubListSize = 1; |
|
|
|
|
|
for (Object[] os : fields) |
|
|
|
|
|
{ |
|
|
|
|
|
Field field = (Field) os[0]; |
|
|
|
|
|
if (Collection.class.isAssignableFrom(field.getType())) |
|
|
|
|
|
{ |
|
|
|
|
|
try |
|
|
|
|
|
{ |
|
|
|
|
|
Collection<?> subList = (Collection<?>) getTargetValue(vo, field, (Excel) os[1]); |
|
|
|
|
|
if (subList != null && !subList.isEmpty()) |
|
|
|
|
|
{ |
|
|
|
|
|
maxSubListSize = Math.max(maxSubListSize, subList.size()); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
catch (Exception e) |
|
|
|
|
|
{ |
|
|
|
|
|
log.error("获取集合大小失败", e); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
return maxSubListSize; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
@ -903,7 +950,7 @@ public class ExcelUtil<T> |
|
|
*/ |
|
|
*/ |
|
|
public void annotationDataStyles(Map<String, CellStyle> styles, Field field, Excel excel) |
|
|
public void annotationDataStyles(Map<String, CellStyle> styles, Field field, Excel excel) |
|
|
{ |
|
|
{ |
|
|
String key = StringUtils.format("data_{}_{}_{}_{}", excel.align(), excel.color(), excel.backgroundColor(), excel.cellType()); |
|
|
String key = StringUtils.format("data_{}_{}_{}_{}_{}", excel.align(), excel.color(), excel.backgroundColor(), excel.cellType(), excel.wrapText()); |
|
|
if (!styles.containsKey(key)) |
|
|
if (!styles.containsKey(key)) |
|
|
{ |
|
|
{ |
|
|
CellStyle style = wb.createCellStyle(); |
|
|
CellStyle style = wb.createCellStyle(); |
|
|
@ -919,6 +966,7 @@ public class ExcelUtil<T> |
|
|
style.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); |
|
|
style.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex()); |
|
|
style.setFillPattern(FillPatternType.SOLID_FOREGROUND); |
|
|
style.setFillPattern(FillPatternType.SOLID_FOREGROUND); |
|
|
style.setFillForegroundColor(excel.backgroundColor().getIndex()); |
|
|
style.setFillForegroundColor(excel.backgroundColor().getIndex()); |
|
|
|
|
|
style.setWrapText(excel.wrapText()); |
|
|
Font dataFont = wb.createFont(); |
|
|
Font dataFont = wb.createFont(); |
|
|
dataFont.setFontName("Arial"); |
|
|
dataFont.setFontName("Arial"); |
|
|
dataFont.setFontHeightInPoints((short) 10); |
|
|
dataFont.setFontHeightInPoints((short) 10); |
|
|
@ -947,7 +995,7 @@ public class ExcelUtil<T> |
|
|
if (isSubList()) |
|
|
if (isSubList()) |
|
|
{ |
|
|
{ |
|
|
// 填充默认样式，防止合并单元格样式失效
|
|
|
// 填充默认样式，防止合并单元格样式失效
|
|
|
sheet.setDefaultColumnStyle(column, styles.get(StringUtils.format("data_{}_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor(), attr.cellType()))); |
|
|
sheet.setDefaultColumnStyle(column, styles.get(StringUtils.format("data_{}_{}_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor(), attr.cellType(), attr.wrapText()))); |
|
|
if (attr.needMerge()) |
|
|
if (attr.needMerge()) |
|
|
{ |
|
|
{ |
|
|
sheet.addMergedRegion(new CellRangeAddress(rownum - 1, rownum, column, column)); |
|
|
sheet.addMergedRegion(new CellRangeAddress(rownum - 1, rownum, column, column)); |
|
|
@ -1085,10 +1133,12 @@ public class ExcelUtil<T> |
|
|
cell = row.createCell(column); |
|
|
cell = row.createCell(column); |
|
|
if (isSubListValue(vo) && getListCellValue(vo).size() > 1 && attr.needMerge()) |
|
|
if (isSubListValue(vo) && getListCellValue(vo).size() > 1 && attr.needMerge()) |
|
|
{ |
|
|
{ |
|
|
CellRangeAddress cellAddress = new CellRangeAddress(subMergedFirstRowNum, subMergedLastRowNum, column, column); |
|
|
if (subMergedLastRowNum >= subMergedFirstRowNum) |
|
|
sheet.addMergedRegion(cellAddress); |
|
|
{ |
|
|
|
|
|
sheet.addMergedRegion(new CellRangeAddress(subMergedFirstRowNum, subMergedLastRowNum, column, column)); |
|
|
} |
|
|
} |
|
|
cell.setCellStyle(styles.get(StringUtils.format("data_{}_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor(), attr.cellType()))); |
|
|
} |
|
|
|
|
|
cell.setCellStyle(styles.get(StringUtils.format("data_{}_{}_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor(), attr.cellType(), attr.wrapText()))); |
|
|
|
|
|
|
|
|
// 用于读取对象中的属性
|
|
|
// 用于读取对象中的属性
|
|
|
Object value = getTargetValue(vo, field, attr); |
|
|
Object value = getTargetValue(vo, field, attr); |
|
|
@ -1098,6 +1148,7 @@ public class ExcelUtil<T> |
|
|
String dictType = attr.dictType(); |
|
|
String dictType = attr.dictType(); |
|
|
if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value)) |
|
|
if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value)) |
|
|
{ |
|
|
{ |
|
|
|
|
|
cell.getCellStyle().setDataFormat(this.wb.getCreationHelper().createDataFormat().getFormat(dateFormat)); |
|
|
cell.setCellValue(parseDateToStr(dateFormat, value)); |
|
|
cell.setCellValue(parseDateToStr(dateFormat, value)); |
|
|
} |
|
|
} |
|
|
else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value)) |
|
|
else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value)) |
|
|
@ -1398,8 +1449,7 @@ public class ExcelUtil<T> |
|
|
*/ |
|
|
*/ |
|
|
public String encodingFilename(String filename) |
|
|
public String encodingFilename(String filename) |
|
|
{ |
|
|
{ |
|
|
filename = UUID.randomUUID() + "_" + filename + ".xlsx"; |
|
|
return UUID.randomUUID() + "_" + filename + ".xlsx"; |
|
|
return filename; |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
@ -1429,6 +1479,7 @@ public class ExcelUtil<T> |
|
|
*/ |
|
|
*/ |
|
|
private Object getTargetValue(T vo, Field field, Excel excel) throws Exception |
|
|
private Object getTargetValue(T vo, Field field, Excel excel) throws Exception |
|
|
{ |
|
|
{ |
|
|
|
|
|
field.setAccessible(true); |
|
|
Object o = field.get(vo); |
|
|
Object o = field.get(vo); |
|
|
if (StringUtils.isNotEmpty(excel.targetAttr())) |
|
|
if (StringUtils.isNotEmpty(excel.targetAttr())) |
|
|
{ |
|
|
{ |
|
|
@ -1488,9 +1539,40 @@ public class ExcelUtil<T> |
|
|
List<Field> tempFields = new ArrayList<>(); |
|
|
List<Field> tempFields = new ArrayList<>(); |
|
|
tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields())); |
|
|
tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields())); |
|
|
tempFields.addAll(Arrays.asList(clazz.getDeclaredFields())); |
|
|
tempFields.addAll(Arrays.asList(clazz.getDeclaredFields())); |
|
|
|
|
|
if (StringUtils.isNotEmpty(includeFields)) |
|
|
|
|
|
{ |
|
|
|
|
|
for (Field field : tempFields) |
|
|
|
|
|
{ |
|
|
|
|
|
if (ArrayUtils.contains(this.includeFields, field.getName()) || field.isAnnotationPresent(Excels.class)) |
|
|
|
|
|
{ |
|
|
|
|
|
addField(fields, field); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
else if (StringUtils.isNotEmpty(excludeFields)) |
|
|
|
|
|
{ |
|
|
for (Field field : tempFields) |
|
|
for (Field field : tempFields) |
|
|
{ |
|
|
{ |
|
|
if (!ArrayUtils.contains(this.excludeFields, field.getName())) |
|
|
if (!ArrayUtils.contains(this.excludeFields, field.getName())) |
|
|
|
|
|
{ |
|
|
|
|
|
addField(fields, field); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
else |
|
|
|
|
|
{ |
|
|
|
|
|
for (Field field : tempFields) |
|
|
|
|
|
{ |
|
|
|
|
|
addField(fields, field); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
return fields; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* 添加字段信息 |
|
|
|
|
|
*/ |
|
|
|
|
|
public void addField(List<Object[]> fields, Field field) |
|
|
{ |
|
|
{ |
|
|
// 单注解
|
|
|
// 单注解
|
|
|
if (field.isAnnotationPresent(Excel.class)) |
|
|
if (field.isAnnotationPresent(Excel.class)) |
|
|
@ -1498,7 +1580,6 @@ public class ExcelUtil<T> |
|
|
Excel attr = field.getAnnotation(Excel.class); |
|
|
Excel attr = field.getAnnotation(Excel.class); |
|
|
if (attr != null && (attr.type() == Type.ALL || attr.type() == type)) |
|
|
if (attr != null && (attr.type() == Type.ALL || attr.type() == type)) |
|
|
{ |
|
|
{ |
|
|
field.setAccessible(true); |
|
|
|
|
|
fields.add(new Object[] { field, attr }); |
|
|
fields.add(new Object[] { field, attr }); |
|
|
} |
|
|
} |
|
|
if (Collection.class.isAssignableFrom(field.getType())) |
|
|
if (Collection.class.isAssignableFrom(field.getType())) |
|
|
@ -1517,17 +1598,24 @@ public class ExcelUtil<T> |
|
|
Excel[] excels = attrs.value(); |
|
|
Excel[] excels = attrs.value(); |
|
|
for (Excel attr : excels) |
|
|
for (Excel attr : excels) |
|
|
{ |
|
|
{ |
|
|
if (!ArrayUtils.contains(this.excludeFields, field.getName() + "." + attr.targetAttr()) |
|
|
if (StringUtils.isNotEmpty(includeFields)) |
|
|
|
|
|
{ |
|
|
|
|
|
if (ArrayUtils.contains(this.includeFields, field.getName() + "." + attr.targetAttr()) |
|
|
&& (attr != null && (attr.type() == Type.ALL || attr.type() == type))) |
|
|
&& (attr != null && (attr.type() == Type.ALL || attr.type() == type))) |
|
|
{ |
|
|
{ |
|
|
field.setAccessible(true); |
|
|
|
|
|
fields.add(new Object[] { field, attr }); |
|
|
fields.add(new Object[] { field, attr }); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
else |
|
|
|
|
|
{ |
|
|
|
|
|
if (!ArrayUtils.contains(this.excludeFields, field.getName() + "." + attr.targetAttr()) |
|
|
|
|
|
&& (attr != null && (attr.type() == Type.ALL || attr.type() == type))) |
|
|
|
|
|
{ |
|
|
|
|
|
fields.add(new Object[] { field, attr }); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
return fields; |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
|
Tony
8 months ago