From f1ad521d9a7abfe75f2b77e7422c83eada0d4c47 Mon Sep 17 00:00:00 2001 From: junjun Date: Mon, 6 Jan 2025 14:51:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dyear=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=8D=E5=B1=95=E7=A4=BA=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/engine/trans/Dimension2SQLObj.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/core-backend/src/main/java/io/dataease/engine/trans/Dimension2SQLObj.java b/core/core-backend/src/main/java/io/dataease/engine/trans/Dimension2SQLObj.java index 5f14fdaeee..9078ce6962 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/trans/Dimension2SQLObj.java +++ b/core/core-backend/src/main/java/io/dataease/engine/trans/Dimension2SQLObj.java @@ -91,7 +91,7 @@ public class Dimension2SQLObj { if (Objects.equals(x.getDeExtractType(), DeTypeConstants.DE_TIME)) { if (Objects.equals(x.getDeType(), DeTypeConstants.DE_INT) || Objects.equals(x.getDeType(), DeTypeConstants.DE_FLOAT)) { fieldName = String.format(SQLConstants.UNIX_TIMESTAMP, originField); - } else if (Objects.equals(x.getDeType(), DeTypeConstants.DE_TIME)) { + } else if (Objects.equals(x.getDeType(), DeTypeConstants.DE_TIME) && !StringUtils.equalsIgnoreCase(x.getType(), "year")) { // 如果都是时间类型，把date和time类型进行字符串拼接 if (isCross) { if (StringUtils.equalsIgnoreCase(x.getType(), "date")) {