forked from github/dataease
fix: 日期下钻
This commit is contained in:
parent
550ec2a2ed
commit
d3e2756b26
@ -872,6 +872,12 @@ public class CHQueryProvider extends QueryProvider {
|
|||||||
split = "-";
|
split = "-";
|
||||||
} else if (StringUtils.equalsIgnoreCase(datePattern, "date_split")) {
|
} else if (StringUtils.equalsIgnoreCase(datePattern, "date_split")) {
|
||||||
split = "/";
|
split = "/";
|
||||||
|
} else {
|
||||||
|
split = "-";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (StringUtils.isEmpty(dateStyle)) {
|
||||||
|
return "%Y-%m-%d %H:%M:%S";
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (dateStyle) {
|
switch (dateStyle) {
|
||||||
|
@ -865,6 +865,12 @@ public class DorisQueryProvider extends QueryProvider {
|
|||||||
split = "-";
|
split = "-";
|
||||||
} else if (StringUtils.equalsIgnoreCase(datePattern, "date_split")) {
|
} else if (StringUtils.equalsIgnoreCase(datePattern, "date_split")) {
|
||||||
split = "/";
|
split = "/";
|
||||||
|
} else {
|
||||||
|
split = "-";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (StringUtils.isEmpty(dateStyle)) {
|
||||||
|
return "%Y-%m-%d %H:%i:%S";
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (dateStyle) {
|
switch (dateStyle) {
|
||||||
|
@ -816,6 +816,12 @@ public class EsQueryProvider extends QueryProvider {
|
|||||||
split = "-";
|
split = "-";
|
||||||
} else if (StringUtils.equalsIgnoreCase(datePattern, "date_split")) {
|
} else if (StringUtils.equalsIgnoreCase(datePattern, "date_split")) {
|
||||||
split = "/";
|
split = "/";
|
||||||
|
} else {
|
||||||
|
split = "-";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (StringUtils.isEmpty(dateStyle)) {
|
||||||
|
return "YYYY-MM-dd HH:mm:ss";
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (dateStyle) {
|
switch (dateStyle) {
|
||||||
|
@ -859,6 +859,12 @@ public class MysqlQueryProvider extends QueryProvider {
|
|||||||
split = "-";
|
split = "-";
|
||||||
} else if (StringUtils.equalsIgnoreCase(datePattern, "date_split")) {
|
} else if (StringUtils.equalsIgnoreCase(datePattern, "date_split")) {
|
||||||
split = "/";
|
split = "/";
|
||||||
|
} else {
|
||||||
|
split = "-";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (StringUtils.isEmpty(dateStyle)) {
|
||||||
|
return "%Y-%m-%d %H:%i:%S";
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (dateStyle) {
|
switch (dateStyle) {
|
||||||
|
@ -899,6 +899,12 @@ public class OracleQueryProvider extends QueryProvider {
|
|||||||
split = "-";
|
split = "-";
|
||||||
} else if (StringUtils.equalsIgnoreCase(datePattern, "date_split")) {
|
} else if (StringUtils.equalsIgnoreCase(datePattern, "date_split")) {
|
||||||
split = "/";
|
split = "/";
|
||||||
|
} else {
|
||||||
|
split = "-";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (StringUtils.isEmpty(dateStyle)) {
|
||||||
|
return OracleConstants.DEFAULT_DATE_FORMAT;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (dateStyle) {
|
switch (dateStyle) {
|
||||||
|
@ -886,6 +886,12 @@ public class PgQueryProvider extends QueryProvider {
|
|||||||
split = "-";
|
split = "-";
|
||||||
} else if (StringUtils.equalsIgnoreCase(datePattern, "date_split")) {
|
} else if (StringUtils.equalsIgnoreCase(datePattern, "date_split")) {
|
||||||
split = "/";
|
split = "/";
|
||||||
|
} else {
|
||||||
|
split = "-";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (StringUtils.isEmpty(dateStyle)) {
|
||||||
|
return "'YYYY-MM-DD HH24:MI:SS'";
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (dateStyle) {
|
switch (dateStyle) {
|
||||||
|
@ -13,6 +13,7 @@ import io.dataease.dto.chart.ChartViewFieldDTO;
|
|||||||
import io.dataease.dto.sqlObj.SQLObj;
|
import io.dataease.dto.sqlObj.SQLObj;
|
||||||
import io.dataease.provider.QueryProvider;
|
import io.dataease.provider.QueryProvider;
|
||||||
import io.dataease.provider.SQLConstants;
|
import io.dataease.provider.SQLConstants;
|
||||||
|
import io.dataease.provider.oracle.OracleConstants;
|
||||||
import org.apache.commons.collections4.CollectionUtils;
|
import org.apache.commons.collections4.CollectionUtils;
|
||||||
import org.apache.commons.lang3.ObjectUtils;
|
import org.apache.commons.lang3.ObjectUtils;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
@ -825,6 +826,12 @@ public class SqlserverQueryProvider extends QueryProvider {
|
|||||||
split = "-";
|
split = "-";
|
||||||
} else if (StringUtils.equalsIgnoreCase(datePattern, "date_split")) {
|
} else if (StringUtils.equalsIgnoreCase(datePattern, "date_split")) {
|
||||||
split = "/";
|
split = "/";
|
||||||
|
} else {
|
||||||
|
split = "-";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (StringUtils.isEmpty(dateStyle)) {
|
||||||
|
return "convert(varchar," + originField + ",120)";
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (dateStyle) {
|
switch (dateStyle) {
|
||||||
|
Loading…
Reference in New Issue
Block a user