From bbaea043257d99a0bcbebce81e75aa98082ec494 Mon Sep 17 00:00:00 2001 From: junjun Date: Tue, 16 Apr 2024 11:34:25 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E4=B8=8B=E6=8B=89=E7=BB=84=E4=BB=B6=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5=E5=92=8C=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/dataease/chart/manage/ChartViewManege.java | 1 + .../main/java/io/dataease/dataset/manage/DatasetDataManage.java | 2 +- .../main/java/io/dataease/api/chart/dto/ChartViewFieldDTO.java | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java index e7e66951b2..58c003e400 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java +++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java @@ -151,6 +151,7 @@ public class ChartViewManege { for (String func : FunctionConstant.AGG_FUNC) { if (Utils.matchFunction(func, originField)) { ele.setSummary(""); + ele.setAgg(true); break; } } diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java index 2737028633..d376712797 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java @@ -588,7 +588,7 @@ public class DatasetDataManage { Field2SQLObj.field2sqlObj(sqlMeta, fields, crossDs, dsMap); WhereTree2Str.transFilterTrees(sqlMeta, rowPermissionsTree, fields, crossDs, dsMap); Order2SQLObj.getOrders(sqlMeta, fields, datasetGroupInfoDTO.getSortFields(), crossDs, dsMap); - String querySQL = SQLProvider.createQuerySQLWithLimit(sqlMeta, false, needOrder, true, 0, 1000); + String querySQL = SQLProvider.createQuerySQLWithLimit(sqlMeta, false, needOrder, false, 0, 1000); querySQL = SqlUtils.rebuildSQL(querySQL, sqlMeta, crossDs, dsMap); logger.info("calcite data enum sql: " + querySQL); diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartViewFieldDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartViewFieldDTO.java index f6858163bf..e819d7b907 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartViewFieldDTO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartViewFieldDTO.java @@ -21,4 +21,6 @@ public class ChartViewFieldDTO extends ChartViewFieldBaseDTO implements Serializ private List customSort; private String busiType; + + private boolean isAgg; }