|
|
@ -1,6 +1,7 @@ |
|
|
|
package com.alibaba.excel.metadata.property; |
|
|
|
package com.alibaba.excel.metadata.property; |
|
|
|
|
|
|
|
|
|
|
|
import java.lang.reflect.Field; |
|
|
|
import java.lang.reflect.Field; |
|
|
|
|
|
|
|
import java.lang.reflect.Modifier; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.Collections; |
|
|
|
import java.util.Collections; |
|
|
|
import java.util.HashMap; |
|
|
|
import java.util.HashMap; |
|
|
@ -123,6 +124,14 @@ public class ExcelHeadProperty { |
|
|
|
Map<Integer, Field> customFiledMap = new TreeMap<Integer, Field>(); |
|
|
|
Map<Integer, Field> customFiledMap = new TreeMap<Integer, Field>(); |
|
|
|
for (Field field : fieldList) { |
|
|
|
for (Field field : fieldList) { |
|
|
|
ExcelIgnore excelIgnore = field.getAnnotation(ExcelIgnore.class); |
|
|
|
ExcelIgnore excelIgnore = field.getAnnotation(ExcelIgnore.class); |
|
|
|
|
|
|
|
if(Modifier.isStatic(field.getModifiers())&&Modifier.isFinal(field.getModifiers())){ |
|
|
|
|
|
|
|
ignoreMap.put(field.getName(),field); |
|
|
|
|
|
|
|
continue; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if(Modifier.isTransient(field.getModifiers())){ |
|
|
|
|
|
|
|
ignoreMap.put(field.getName(),field); |
|
|
|
|
|
|
|
continue; |
|
|
|
|
|
|
|
} |
|
|
|
if (excelIgnore != null) { |
|
|
|
if (excelIgnore != null) { |
|
|
|
ignoreMap.put(field.getName(), field); |
|
|
|
ignoreMap.put(field.getName(), field); |
|
|
|
continue; |
|
|
|
continue; |
|
|
|