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

Merge pull request #5312 from dataease/pr@dev@refactor_date

Browse Source 
refactor: 季度、周格式增加字母标识
This commit is contained in:
Junjun 2023-05-25 13:25:07 +08:00 committed by GitHub
commit 86d0532db3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java
View File

@ -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":

4
backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java
View File

@ -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":

4
backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java
View File

@ -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":