dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(视图): ClickHouse, Oracle支持年季度、年周

Browse Source
This commit is contained in:
junjun 2024-03-18 14:48:09 +08:00
parent 6d974ae409
commit 54a6963d49
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java
View File

@ -1551,11 +1551,11 @@ public class CKQueryProvider extends QueryProvider {
case "y": case "y":
return "%Y"; return "%Y";
case "y_Q": case "y_Q":
return "CONCAT(%s,'" + split + "','Q',%s)"; return "CONCAT(toString(%s),'" + split + "','Q',toString(%s))";
case "y_M": case "y_M":
return "%Y" + split + "%m"; return "%Y" + split + "%m";
case "y_W": case "y_W":
return "CONCAT(%s,'" + split + "','W',%s)"; return "CONCAT(toString(%s),'" + split + "','W',toString(%s))";
case "y_M_d": case "y_M_d":
return "%Y" + split + "%m" + split + "%d"; return "%Y" + split + "%m" + split + "%d";
case "H_m_s": case "H_m_s":
@ -1600,28 +1600,30 @@ public class CKQueryProvider extends QueryProvider {
if (x.getDeType() == DeTypeConstants.DE_TIME) { if (x.getDeType() == DeTypeConstants.DE_TIME) {
String format = transDateFormat(x.getDateStyle(), x.getDatePattern()); String format = transDateFormat(x.getDateStyle(), x.getDatePattern());
if (x.getDeExtractType() == DeTypeConstants.DE_STRING) { if (x.getDeExtractType() == DeTypeConstants.DE_STRING) {
String s = String.format(CKConstants.toDateTime, originField);
if (StringUtils.equalsIgnoreCase(x.getDateStyle(), "y_Q")) { if (StringUtils.equalsIgnoreCase(x.getDateStyle(), "y_Q")) {
fieldName = String.format(format, fieldName = String.format(format,
String.format(CKConstants.toYear, "toDate(" + originField + ")"), String.format(CKConstants.toYear, String.format(CKConstants.toDateTime, originField)),
String.format(CKConstants.toQuarter, "toDate(" + originField + ")")); String.format(CKConstants.toQuarter, String.format(CKConstants.toDateTime, originField)));
} else if (StringUtils.equalsIgnoreCase(x.getDateStyle(), "y_W")) { } else if (StringUtils.equalsIgnoreCase(x.getDateStyle(), "y_W")) {
fieldName = String.format(format, fieldName = String.format(format,
String.format(CKConstants.toYear, "toDate(" + originField + ")"), String.format(CKConstants.toYear, s),
String.format(CKConstants.toWeek, "toDate(" + originField + ")")); String.format(CKConstants.toWeek, s));
} else { } else {
fieldName = String.format(CKConstants.formatDateTime, String.format(CKConstants.toDateTime, originField), format); fieldName = String.format(CKConstants.formatDateTime, s, format);
} }
} else { } else {
String s = String.format(CKConstants.toDateTime, String.format(CKConstants.toFloat64, originField));
if (StringUtils.equalsIgnoreCase(x.getDateStyle(), "y_Q")) { if (StringUtils.equalsIgnoreCase(x.getDateStyle(), "y_Q")) {
fieldName = String.format(format, fieldName = String.format(format,
String.format(CKConstants.toYear, "toDate(" + originField + ")"), String.format(CKConstants.toYear, s),
String.format(CKConstants.toQuarter, "toDate(" + originField + ")")); String.format(CKConstants.toQuarter, s));
} else if (StringUtils.equalsIgnoreCase(x.getDateStyle(), "y_W")) { } else if (StringUtils.equalsIgnoreCase(x.getDateStyle(), "y_W")) {
fieldName = String.format(format, fieldName = String.format(format,
String.format(CKConstants.toYear, "toDate(" + originField + ")"), String.format(CKConstants.toYear, s),
String.format(CKConstants.toWeek, "toDate(" + originField + ")")); String.format(CKConstants.toWeek, s));
} else { } else {
fieldName = String.format(CKConstants.formatDateTime, String.format(CKConstants.toDateTime, String.format(CKConstants.toFloat64, originField)), format); fieldName = String.format(CKConstants.formatDateTime, s, format);
} }
} }
} else { } else {