支持自定义显示Excel属性列

@@ -195,6 +195,11 @@ public class ExcelUtil<T>
     public Class<T> clazz;
     public Class<T> clazz;
 
 
     /**
     /**
+     * 需要显示列属性
+     */
+    public String[] includeFields;
+
+    /**
      * 需要排除列属性
      * 需要排除列属性
      */
      */
     public String[] excludeFields;
     public String[] excludeFields;
@@ -205,10 +210,19 @@ public class ExcelUtil<T>
     }
     }
 
 
     /**
     /**
+     * 仅在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)
     {
     {
@@ -1488,10 +1502,41 @@ 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))
         {
         {
@@ -1517,17 +1562,26 @@ 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);
                         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)))
+                    {
+                        field.setAccessible(true);
+                        fields.add(new Object[] { field, attr });
+                    }
                 }
                 }
             }
             }
         }
         }
-        return fields;
     }
     }
 
 
     /**
     /**