center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix(仪表板): 是否导出数据量不准确问题

Browse Source
This commit is contained in:
wangjiahao 2024-06-05 18:33:16 +08:00
parent 0505497b27
commit 9505fa85b8
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@ import io.dataease.api.chart.ChartDataApi;
import io.dataease.api.chart.dto.ChartViewDTO; import io.dataease.api.chart.dto.ChartViewDTO;
import io.dataease.api.chart.dto.ViewDetailField; import io.dataease.api.chart.dto.ViewDetailField;
import io.dataease.api.chart.request.ChartExcelRequest; import io.dataease.api.chart.request.ChartExcelRequest;
import io.dataease.chart.constant.ChartConstants;
import io.dataease.chart.manage.ChartDataManage; import io.dataease.chart.manage.ChartDataManage;
import io.dataease.constant.AuthConstant; import io.dataease.constant.AuthConstant;
import io.dataease.constant.CommonConstants; import io.dataease.constant.CommonConstants;
@ -69,7 +70,12 @@ public class ChartDataServer implements ChartDataApi {
try { try {
ChartViewDTO viewDTO = request.getViewInfo(); ChartViewDTO viewDTO = request.getViewInfo();
viewDTO.setIsExcelExport(true); viewDTO.setIsExcelExport(true);
viewDTO.setResultCount(limit); if(ChartConstants.VIEW_RESULT_MODE.CUSTOM.equals(viewDTO.getResultMode())){
Integer limitCount = viewDTO.getResultCount();
viewDTO.setResultCount(limitCount>limit?limit:limitCount);
}else{
viewDTO.setResultCount(limit);
}
ChartViewDTO chartViewInfo = getData(viewDTO); ChartViewDTO chartViewInfo = getData(viewDTO);
List<Object[]> tableRow = (List) chartViewInfo.getData().get("sourceData"); List<Object[]> tableRow = (List) chartViewInfo.getData().get("sourceData");
request.setDetails(tableRow); request.setDetails(tableRow);