From 19fb459d6564524b869b61d78c0eca1c7e372c79 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 31 Jan 2024 12:12:44 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20=E5=90=8C?= =?UTF-8?q?=E6=AD=A5DECIMAL=E7=B1=BB=E5=9E=8B=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/provider/engine/doris/DorisDDLProvider.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisDDLProvider.java b/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisDDLProvider.java index 2fa7fd4add..79378adcc3 100644 --- a/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisDDLProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisDDLProvider.java @@ -66,7 +66,7 @@ public class DorisDDLProvider extends DDLProviderImpl { sql = sql.replace("`UNIQUE_KEY`", "`" + String.join("`, `", keys) + "`") .replace("DISTRIBUTED_BY_HASH", keys.get(0)).replace("Column_Fields", createDorisTableColumnSql(datasetTableFields, version, keys)); } else { - if(!datasetTableFields.stream().map(DatasetTableField::getDataeaseName).collect(Collectors.toList()).contains("dataease_uuid")){ + if (!datasetTableFields.stream().map(DatasetTableField::getDataeaseName).collect(Collectors.toList()).contains("dataease_uuid")) { List tempList = new ArrayList<>(); DatasetTableField datasetTableField = new DatasetTableField(); datasetTableField.setDeExtractType(0); @@ -80,7 +80,7 @@ public class DorisDDLProvider extends DDLProviderImpl { tempList.add(datasetTableFields.get(i)); } sql = sql.replace("UNIQUE_KEY", "dataease_uuid").replace("DISTRIBUTED_BY_HASH", "dataease_uuid").replace("Column_Fields", createDorisTableColumnSql(tempList, version, null)); - }else { + } else { sql = sql.replace("UNIQUE_KEY", "dataease_uuid").replace("DISTRIBUTED_BY_HASH", "dataease_uuid").replace("Column_Fields", createDorisTableColumnSql(datasetTableFields, version, null)); } @@ -114,7 +114,8 @@ public class DorisDDLProvider extends DDLProviderImpl { case 3: if (datasetTableField.getType().equalsIgnoreCase("DECIMAL") && datasetTableField.getAccuracy() != 0) { if (Integer.valueOf(version.split("5.7.")[1]) < 99) { - Column_Fields.append("DECIMAL(" + datasetTableField.getSize() + "," + datasetTableField.getAccuracy() + ")").append(",`"); + Integer p = datasetTableField.getAccuracy() > 9 ? 9 : datasetTableField.getAccuracy(); + Column_Fields.append("DECIMAL(" + datasetTableField.getSize() + "," + p + ")").append(",`"); } else { Column_Fields.append("DecimalV3(" + datasetTableField.getSize() + "," + datasetTableField.getAccuracy() + ")").append(",`"); }