public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-15 05:22:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13717 from dataease/pr@dev-v2@fix_sql

Browse Source 
fix(数据集): 修复sql片段报错的问题
This commit is contained in:
dataeaseShu
2024-12-02 14:04:05 +08:00
committed by GitHub
parent 4fac7db590 b1faf3e87b
commit acf3520853
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java
View File

@@ -429,7 +429,7 @@ public class DatasetDataManage {
if (ObjectUtils.isEmpty(list)) {
return null;
}
sql = SQLUtils.buildOriginPreviewSqlWithOrderBy(SqlPlaceholderConstants.TABLE_PLACEHOLDER, 100, 0, String.format(SQLConstants.FIELD_DOT, list.get(0).getOriginName()) + " ASC ");
sql = SQLUtils.buildOriginPreviewSqlWithOrderBy(SqlPlaceholderConstants.TABLE_PLACEHOLDER, 100, 0, String.format(SQLConstants.FIELD_DOT_FIX, list.get(0).getOriginName()) + " ASC ");
} else {
sql = SQLUtils.buildOriginPreviewSql(SqlPlaceholderConstants.TABLE_PLACEHOLDER, 100, 0);
}

2
core/core-backend/src/main/java/io/dataease/engine/constant/SQLConstants.java
View File

@@ -49,6 +49,8 @@ public class SQLConstants {
public static final String FIELD_DOT = "%s";
public static final String FIELD_DOT_FIX = "`%s`";
public static final String UNIX_TIMESTAMP = "DE_UNIX_TIMESTAMP(%s)";
public static final String DE_DATE_FORMAT = "DE_DATE_FORMAT(%s,'%s')";