ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pre Merge pull request !455 from 电脑大侠/develop

This commit is contained in:
电脑大侠 2024-06-13 06:59:46 +00:00 committed by Gitee
parent 32e448b6b4 4f38ba8b68
commit 22610b3f19
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
View File

@ -12,16 +12,7 @@ import java.math.BigDecimal;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.*;
import java.util.Arrays;
import java.util.Collection;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
@ -751,20 +742,19 @@ public class ExcelUtil<T>
int subIndex = 0; int subIndex = 0;
for (Field subField : subFields) for (Field subField : subFields)
{ {
if (subField.isAnnotationPresent(Excel.class)) if (subField.isAnnotationPresent(Excel.class) && !ArrayUtils.contains(this.excludeFields, field.getName() + "." + subField.getName()))
{ {
subField.setAccessible(true); subField.setAccessible(true);
Excel attr = subField.getAnnotation(Excel.class); Excel attr = subField.getAnnotation(Excel.class);
this.addCell(attr, row, (T) obj, subField, column + subIndex); this.addCell(attr, row, (T) obj, subField, column + subIndex);
}
subIndex++; subIndex++;
} }
}
subFirst = true; subFirst = true;
} }
this.subMergedFirstRowNum = this.subMergedFirstRowNum + subList.size(); this.subMergedFirstRowNum = this.subMergedFirstRowNum + subList.size();
} } else if (!Collection.class.isAssignableFrom(field.getType())) {
else //子类对象可能被隐藏
{
this.addCell(excel, row, vo, field, column++); this.addCell(excel, row, vo, field, column++);
} }
} }
@ -1506,7 +1496,16 @@ public class ExcelUtil<T>
subMethod = getSubMethod(field.getName(), clazz); subMethod = getSubMethod(field.getName(), clazz);
ParameterizedType pt = (ParameterizedType) field.getGenericType(); ParameterizedType pt = (ParameterizedType) field.getGenericType();
Class<?> subClass = (Class<?>) pt.getActualTypeArguments()[0]; Class<?> subClass = (Class<?>) pt.getActualTypeArguments()[0];
this.subFields = FieldUtils.getFieldsListWithAnnotation(subClass, Excel.class); List<Field> fieldList = FieldUtils.getFieldsListWithAnnotation(subClass, Excel.class);
Iterator<Field> iterator = fieldList.iterator();
while (iterator.hasNext()) {
Field next = iterator.next();
if (ArrayUtils.contains(this.excludeFields, field.getName() + "." + next.getName())) {
iterator.remove();
}
}
this.subFields = fieldList;
} }
} }