github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-23 11:03:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: 修复明细表导出 excel bug #14946

Browse Source
This commit is contained in:
taojinlong 2025-02-17 17:17:25 +08:00 committed by 王嘉豪
parent b44a8cc791
commit 16f6fdd8a1
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java
View File

@ -319,8 +319,7 @@ public class ChartDataServer implements ChartDataApi {
if (viewInfo.getType().equalsIgnoreCase("table-normal") || viewInfo.getType().equalsIgnoreCase("table-info")) {
for (ChartViewFieldDTO xAxi : xAxis) {
if (xAxi.getDeType().equals(DeTypeConstants.DE_INT) || xAxi.getDeType().equals(DeTypeConstants.DE_FLOAT)) {
FormatterCfgDTO formatterCfgDTO = xAxi.getFormatterCfg() == null ? new FormatterCfgDTO() : xAxi.getFormatterCfg();
CellStyle formatterCellStyle = createCellStyle(wb, formatterCfgDTO, null);
CellStyle formatterCellStyle = createCellStyle(wb, xAxi.getFormatterCfg(), null);
styles.add(formatterCellStyle);
} else {
styles.add(null);
@ -416,13 +415,7 @@ public class ChartDataServer implements ChartDataApi {
if ((viewInfo.getType().equalsIgnoreCase("table-normal") || viewInfo.getType().equalsIgnoreCase("table-info")) && (xAxis.get(j).getDeType().equals(DeTypeConstants.DE_INT) || xAxis.get(j).getDeType().equals(DeTypeConstants.DE_FLOAT))) {
try {
FormatterCfgDTO formatterCfgDTO = xAxis.get(j).getFormatterCfg() == null ? new FormatterCfgDTO() : xAxis.get(j).getFormatterCfg();
if (formatterCfgDTO.getType().equalsIgnoreCase("auto")) {
row.getCell(j).setCellStyle(createCellStyle(wb, formatterCfgDTO, cellValue(formatterCfgDTO, new BigDecimal(cellValObj.toString()))));
}
if (styles.get(j) != null) {
row.getCell(j).setCellStyle(styles.get(j));
}
row.getCell(j).setCellStyle(styles.get(j));
row.getCell(j).setCellValue(Double.valueOf(cellValue(formatterCfgDTO, new BigDecimal(cellValObj.toString()))));
} catch (Exception e) {
cell.setCellValue(cellValObj.toString());
@ -469,6 +462,11 @@ public class ChartDataServer implements ChartDataApi {
private static CellStyle createCellStyle(Workbook workbook, FormatterCfgDTO formatter, String value) {
CellStyle cellStyle = workbook.createCellStyle();
DataFormat format = workbook.createDataFormat();
if (formatter == null) {
cellStyle.setDataFormat(format.getFormat("General"));
return cellStyle;
}
String formatStr = "";
if (formatter.getType().equals("auto")) {
String[] valueSplit = String.valueOf(value).split(".");