From bb2ffe98db359d39ad19d3ac3255123a9c3c7266 Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Fri, 28 Jun 2024 11:40:42 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=8C=BA=E9=97=B4=E6=9D=A1=E5=BD=A2=E5=9B=BE=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=BB=B4=E5=BA=A6=E8=8C=83=E5=9B=B4=E6=97=B6?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE=E6=8A=A5=E9=94=99=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/chart/charts/impl/bar/RangeBarHandler.java   | 8 +++++---
 .../java/io/dataease/chart/server/ChartDataServer.java    | 8 ++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/RangeBarHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/RangeBarHandler.java
index 5e05016e9d..4a8943ce80 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/RangeBarHandler.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/RangeBarHandler.java
@@ -1,6 +1,5 @@
 package io.dataease.chart.charts.impl.bar;
 
-import io.dataease.chart.charts.impl.DefaultChartHandler;
 import io.dataease.chart.charts.impl.YoyChartHandler;
 import io.dataease.chart.utils.ChartDataBuild;
 import io.dataease.datasource.provider.CalciteProvider;
@@ -19,13 +18,14 @@ import java.util.Map;
 @Component
 public class RangeBarHandler extends YoyChartHandler {
     @Getter
-    private String type = "bar-range";
+    private final String type = "bar-range";
 
     @Override
     public AxisFormatResult formatAxis(ChartViewDTO view) {
         var result = super.formatAxis(view);
         var yAxis = new ArrayList<ChartViewFieldDTO>();
         var xAxis = new ArrayList<ChartViewFieldDTO>(view.getXAxis());
+        var xAxisBase = new ArrayList<ChartViewFieldDTO>(view.getXAxis());
         boolean skipBarRange = false;
         boolean barRangeDate = false;
         if (CollectionUtils.isNotEmpty(view.getYAxis()) && CollectionUtils.isNotEmpty(view.getYAxisExt())) {
@@ -56,6 +56,7 @@ public class RangeBarHandler extends YoyChartHandler {
         result.getContext().put("barRangeDate", barRangeDate);
         result.getAxisMap().put(ChartAxis.xAxis, xAxis);
         result.getAxisMap().put(ChartAxis.yAxis, yAxis);
+        result.getContext().put("xAxisBase", xAxisBase);
         return result;
     }
 
@@ -67,9 +68,10 @@ public class RangeBarHandler extends YoyChartHandler {
                 .anyMatch(ele -> ele.getFilterType() == 1);
         var xAxis = formatResult.getAxisMap().get(ChartAxis.xAxis);
         var yAxis = formatResult.getAxisMap().get(ChartAxis.yAxis);
+        var xAxisBase = (List<ChartViewFieldDTO>) formatResult.getContext().get("xAxisBase");
         var skipBarRange = (boolean) formatResult.getContext().get("skipBarRange");
         var barRangeDate = (boolean) formatResult.getContext().get("barRangeDate");
-        Map<String, Object> result = ChartDataBuild.transBarRangeDataAntV(skipBarRange, barRangeDate, xAxis, xAxis, yAxis, view, data, isDrill);
+        Map<String, Object> result = ChartDataBuild.transBarRangeDataAntV(skipBarRange, barRangeDate, xAxisBase, xAxis, yAxis, view, data, isDrill);
         return result;
     }
 
diff --git a/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java b/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java
index 3cc5b44e44..f19a8cec63 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java
@@ -1,7 +1,6 @@
 package io.dataease.chart.server;
 
 import io.dataease.api.chart.ChartDataApi;
-import io.dataease.extensions.view.dto.ChartViewDTO;
 import io.dataease.api.chart.dto.ViewDetailField;
 import io.dataease.api.chart.request.ChartExcelRequest;
 import io.dataease.api.chart.request.ChartExcelRequestInner;
@@ -12,6 +11,7 @@ import io.dataease.constant.CommonConstants;
 import io.dataease.engine.constant.DeTypeConstants;
 import io.dataease.exception.DEException;
 import io.dataease.exportCenter.manage.ExportCenterManage;
+import io.dataease.extensions.view.dto.ChartViewDTO;
 import io.dataease.result.ResultCode;
 import io.dataease.utils.LogUtil;
 import io.dataease.visualization.manage.VisualizationTemplateExtendDataManage;
@@ -70,10 +70,10 @@ public class ChartDataServer implements ChartDataApi {
         try {
             ChartViewDTO viewDTO = request.getViewInfo();
             viewDTO.setIsExcelExport(true);
-            if(ChartConstants.VIEW_RESULT_MODE.CUSTOM.equals(viewDTO.getResultMode())){
+            if (ChartConstants.VIEW_RESULT_MODE.CUSTOM.equals(viewDTO.getResultMode())) {
                 Integer limitCount = viewDTO.getResultCount();
-                viewDTO.setResultCount(limitCount>limit?limit:limitCount);
-            }else{
+                viewDTO.setResultCount(limitCount > limit ? limit : limitCount);
+            } else {
                 viewDTO.setResultCount(limit);
             }
             ChartViewDTO chartViewInfo = getData(viewDTO);