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

Merge pull request #8565 from dataease/pr@dev@feat_date

Browse Source 
feat(视图): ClickHouse, Oracle支持年季度、年周
This commit is contained in:
Junjun 2024-03-18 15:50:53 +08:00 committed by GitHub
commit e1565db6c3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1603,8 +1603,8 @@ public class CKQueryProvider extends QueryProvider {
String s = String.format(CKConstants.toDateTime, originField);
if (StringUtils.equalsIgnoreCase(x.getDateStyle(), "y_Q")) {
fieldName = String.format(format,
String.format(CKConstants.toYear, String.format(CKConstants.toDateTime, originField)),
String.format(CKConstants.toQuarter, String.format(CKConstants.toDateTime, originField)));
String.format(CKConstants.toYear, s),
String.format(CKConstants.toQuarter, s));
} else if (StringUtils.equalsIgnoreCase(x.getDateStyle(), "y_W")) {
fieldName = String.format(format,
String.format(CKConstants.toYear, s),