From 69598d0530e002137242550017cec7f96e39d58d Mon Sep 17 00:00:00 2001 From: junjun Date: Thu, 25 May 2023 13:23:36 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=AD=A3=E5=BA=A6=E3=80=81?= =?UTF-8?q?=E5=91=A8=E6=A0=BC=E5=BC=8F=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AF=8D?= =?UTF-8?q?=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/provider/engine/doris/DorisQueryProvider.java | 4 ++-- .../io/dataease/provider/engine/mysql/MysqlQueryProvider.java | 4 ++-- .../io/dataease/provider/query/mysql/MysqlQueryProvider.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java b/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java index 5c6cc33712..cd1af62e89 100644 --- a/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java @@ -1158,11 +1158,11 @@ public class DorisQueryProvider extends QueryProvider { case "y": return "%Y"; case "y_Q": - return "CONCAT(%s,'" + split + "',%s)"; + return "CONCAT(%s,'" + split + "','Q',%s)"; case "y_M": return "%Y" + split + "%m"; case "y_W": - return "%Y" + split + "%u"; + return "%Y" + split + "W%u"; case "y_M_d": return "%Y" + split + "%m" + split + "%d"; case "H_m_s": diff --git a/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java b/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java index 070dc44f76..3caac20d8f 100644 --- a/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java @@ -1145,11 +1145,11 @@ public class MysqlQueryProvider extends QueryProvider { case "y": return "%Y"; case "y_Q": - return "CONCAT(%s,'" + split + "',%s)"; + return "CONCAT(%s,'" + split + "','Q',%s)"; case "y_M": return "%Y" + split + "%m"; case "y_W": - return "%Y" + split + "%u"; + return "%Y" + split + "W%u"; case "y_M_d": return "%Y" + split + "%m" + split + "%d"; case "H_m_s": diff --git a/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java index 1d6d357b7e..bad34ddb82 100644 --- a/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java @@ -1178,11 +1178,11 @@ public class MysqlQueryProvider extends QueryProvider { case "y": return "%Y"; case "y_Q": - return "CONCAT(%s,'" + split + "',%s)"; + return "CONCAT(%s,'" + split + "','Q',%s)"; case "y_M": return "%Y" + split + "%m"; case "y_W": - return "%Y" + split + "%u"; + return "%Y" + split + "W%u"; case "y_M_d": return "%Y" + split + "%m" + split + "%d"; case "H_m_s":