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

Merge pull request #11666 from dataease/pr@dev-v2@fix_ds

Browse Source 
fix(数据集): 修复数据集字段类型
This commit is contained in:
Junjun 2024-08-21 14:48:22 +08:00 committed by GitHub
commit 793ab19045
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-backend/src/main/java/io/dataease/engine/trans/CustomWhere2Str.java
View File

@ -124,7 +124,7 @@ public class CustomWhere2Str {
whereName = String.format(SQLConstants.UNIX_TIMESTAMP, originName); whereName = String.format(SQLConstants.UNIX_TIMESTAMP, originName);
} }
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 4) { if (field.getDeExtractType() == 2 || field.getDeExtractType() == 4) {
whereName = originName; whereName = String.format(SQLConstants.CAST, originName, SQLConstants.DEFAULT_INT_FORMAT);
} }
if (field.getDeExtractType() == 3) { if (field.getDeExtractType() == 3) {
whereName = String.format(SQLConstants.CAST, originName, SQLConstants.DEFAULT_FLOAT_FORMAT); whereName = String.format(SQLConstants.CAST, originName, SQLConstants.DEFAULT_FLOAT_FORMAT);

2
core/core-backend/src/main/java/io/dataease/engine/trans/ExtWhere2Str.java
View File

@ -96,7 +96,7 @@ public class ExtWhere2Str {
whereName = String.format(SQLConstants.UNIX_TIMESTAMP, originName); whereName = String.format(SQLConstants.UNIX_TIMESTAMP, originName);
} }
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 4) { if (field.getDeExtractType() == 2 || field.getDeExtractType() == 4) {
whereName = originName; whereName = String.format(SQLConstants.CAST, originName, SQLConstants.DEFAULT_INT_FORMAT);
} }
if (field.getDeExtractType() == 3) { if (field.getDeExtractType() == 3) {
whereName = String.format(SQLConstants.CAST, originName, SQLConstants.DEFAULT_FLOAT_FORMAT); whereName = String.format(SQLConstants.CAST, originName, SQLConstants.DEFAULT_FLOAT_FORMAT);

2
core/core-backend/src/main/java/io/dataease/engine/trans/WhereTree2Str.java
View File

@ -126,7 +126,7 @@ public class WhereTree2Str {
whereName = String.format(SQLConstants.UNIX_TIMESTAMP, originName); whereName = String.format(SQLConstants.UNIX_TIMESTAMP, originName);
} }
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 4) { if (field.getDeExtractType() == 2 || field.getDeExtractType() == 4) {
whereName = originName; whereName = String.format(SQLConstants.CAST, originName, SQLConstants.DEFAULT_INT_FORMAT);
} }
if (field.getDeExtractType() == 3) { if (field.getDeExtractType() == 3) {
whereName = String.format(SQLConstants.CAST, originName, SQLConstants.DEFAULT_FLOAT_FORMAT); whereName = String.format(SQLConstants.CAST, originName, SQLConstants.DEFAULT_FLOAT_FORMAT);