public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-15 13:32:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(图表): 修复某些维度下指标的数据不存在，指标累加时，出现累加中断的情况

Browse Source
This commit is contained in:
jianneng-fit2cloud
2025-03-17 14:41:19 +08:00
committed by jianneng-fit2cloud
parent 0282de0642
commit 490af7eee1
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/core-backend/src/main/java/io/dataease/chart/charts/impl/DefaultChartHandler.java
View File

@@ -533,7 +533,7 @@ public class DefaultChartHandler extends AbstractChartPlugin {
}
boolean isStack = StringUtils.containsIgnoreCase(chartType, "stack") && CollectionUtils.isNotEmpty(extStack);
boolean isGroup = StringUtils.containsIgnoreCase(chartType, "group")
|| (StringUtils.containsIgnoreCase(chartType, "-mix") && CollectionUtils.isNotEmpty(xAxisExt));
|| (CollectionUtils.isNotEmpty(xAxisExt));
if (isStack || isGroup) {
if (CollectionUtils.isEmpty(xAxis)) {
break;
@@ -562,18 +562,21 @@ public class DefaultChartHandler extends AbstractChartPlugin {
});
int finalDataIndex = dataIndex;
int subEndIndex = xAxisBase.size();
if (StringUtils.containsIgnoreCase(chartType, "group") || StringUtils.containsIgnoreCase(chartType, "-mix")) {
if (CollectionUtils.isNotEmpty(xAxisExt)
|| StringUtils.containsIgnoreCase(chartType, "group")
|| StringUtils.containsIgnoreCase(chartType, "-mix")) {
subEndIndex += xAxisExt.size();
}
if (StringUtils.containsIgnoreCase(chartType, "stack")) {
subEndIndex += extStack.size();
}
int finalSubEndIndex = subEndIndex;
// 存储上次的值
Map<String, BigDecimal> preDataMap = new HashMap<>();
//滑动累加
for (int k = 1; k < mainMatrix.size(); k++) {
List<String[]> preDataItems = mainMatrix.get(k - 1);
List<String[]> curDataItems = mainMatrix.get(k);
Map<String, BigDecimal> preDataMap = new HashMap<>();
preDataItems.forEach(preDataItem -> {
String[] groupStackAxisArr = Arrays.copyOfRange(preDataItem, xAxisBase.size(), finalSubEndIndex);
String groupStackAxis = StringUtils.join(groupStackAxisArr, '-');
@@ -591,6 +594,12 @@ public class DefaultChartHandler extends AbstractChartPlugin {
curDataItem[finalDataIndex] = new BigDecimal(curDataItem[finalDataIndex])
.add(preValue)
.toString();
} else {
if (preDataMap.containsKey(groupStackAxis)) {
curDataItem[finalDataIndex] = new BigDecimal(curDataItem[finalDataIndex])
.add(preDataMap.get(groupStackAxis))
.toString();
}
}
});
}