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

Merge pull request #2757 from dataease/pr@dev@fix_email_task_view_number

Browse Source 
fix(系统管理-定时报告): 定时报告发送视图数据包含无效小数
This commit is contained in:
fit2cloud-chenyw 2022-08-02 09:06:55 +08:00 committed by fit2cloud-chenyw
parent a14337463e
commit 89802117b2
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,7 +104,7 @@ public class ViewExportExcel {
Object val = row.get(key); Object val = row.get(key);
if (ObjectUtils.isEmpty(val)) if (ObjectUtils.isEmpty(val))
return StringUtils.EMPTY; return StringUtils.EMPTY;
return val.toString(); return filterInvalidDecimal(val.toString());
}).collect(Collectors.toList())).collect(Collectors.toList()); }).collect(Collectors.toList())).collect(Collectors.toList());
result.setHeads(heads); result.setHeads(heads);
result.setDatas(details); result.setDatas(details);
@ -112,4 +112,12 @@ public class ViewExportExcel {
result.setSheetName(title); result.setSheetName(title);
return result; return result;
} }
private String filterInvalidDecimal(String sourceNumberStr) {
if (StringUtils.isNotBlank(sourceNumberStr) && StringUtils.contains(sourceNumberStr, ".")) {
sourceNumberStr = sourceNumberStr.replaceAll("0+?$", "");
sourceNumberStr = sourceNumberStr.replaceAll("[.]$", "");
}
return sourceNumberStr;
}
} }