dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11322 from dataease/dev

Browse Source 
merge Dev
This commit is contained in:
fit2cloudrd 2024-08-01 16:12:52 +08:00 committed by GitHub
commit 01643672ea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java
View File

@ -130,12 +130,21 @@ public class ViewExportExcel {
Object objectTableRow = chart.get("tableRow");
List<Map<String, Object>> tableRow = (List<Map<String, Object>>) objectTableRow;
List<List<String>> details = tableRow.stream().map(row -> headKeys.stream().map(key -> {
Object val = row.get(key);
if (ObjectUtils.isEmpty(val))
return StringUtils.EMPTY;
return filterInvalidDecimal(val.toString());
}).collect(Collectors.toList())).collect(Collectors.toList());
List<List<String>> details = tableRow.stream().map(row -> {
List<String> tempList = new ArrayList<>();
for (int i = 0; i < headKeys.size(); i++) {
String key = headKeys.get(i);
Object val = row.get(key);
if (ObjectUtils.isEmpty(val))
tempList.add(StringUtils.EMPTY);
if (fieldTypes.get(i) == 3) {
tempList.add(filterInvalidDecimal(val.toString()));
} else {
tempList.add(val.toString());
}
}
return tempList;
}).collect(Collectors.toList());
result.setHeads(heads);
result.setData(details);
result.setFiledTypes(fieldTypes);