diff --git a/core/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java b/core/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java index 9aaa91f980..66768ac8fc 100644 --- a/core/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java +++ b/core/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java @@ -130,12 +130,21 @@ public class ViewExportExcel { Object objectTableRow = chart.get("tableRow"); List> tableRow = (List>) objectTableRow; - List> 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> details = tableRow.stream().map(row -> { + List 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);