From 00079f6ec55891ee3080538b9c62284ebc8882b2 Mon Sep 17 00:00:00 2001 From: junjun Date: Mon, 4 Mar 2024 12:36:34 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96calcite=20SQL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/engine/trans/CustomWhere2Str.java | 16 +--------------- .../io/dataease/engine/trans/WhereTree2Str.java | 15 +-------------- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/engine/trans/CustomWhere2Str.java b/core/core-backend/src/main/java/io/dataease/engine/trans/CustomWhere2Str.java index 80aaa6178a..33be7705fa 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/trans/CustomWhere2Str.java +++ b/core/core-backend/src/main/java/io/dataease/engine/trans/CustomWhere2Str.java @@ -53,11 +53,6 @@ public class CustomWhere2Str { // 此处获取标准格式的日期 whereName = String.format(SQLConstants.FROM_UNIXTIME, cast, StringUtils.isNotEmpty(field.getDateFormat()) ? field.getDateFormat() : SQLConstants.DEFAULT_DATE_FORMAT); } - if (field.getDeExtractType() == 1) { - // 此处获取标准格式的日期 - String f = DateUtils.get_date_format(originName); - whereName = String.format(SQLConstants.DATE_FORMAT, originName, f); - } } else if (field.getDeType() == 2 || field.getDeType() == 3) { if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) { whereName = String.format(SQLConstants.CAST, originName, SQLConstants.DEFAULT_FLOAT_FORMAT); @@ -88,16 +83,7 @@ public class CustomWhere2Str { String whereNameReal; if (field.getDeType() == 1) { - // 规定几种日期格式，一一匹配，匹配到就是该格式 - if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) { - String f = DateUtils.get_date_format(filterItemDTO.getValue()); - String n = String.format(SQLConstants.DE_STR_TO_DATE, whereName, StringUtils.isNotEmpty(field.getDateFormat()) ? field.getDateFormat() : SQLConstants.DEFAULT_DATE_FORMAT, f); - whereNameReal = String.format(SQLConstants.UNIX_TIMESTAMP, n); - } else { - String f = DateUtils.get_date_format(filterItemDTO.getValue()); - String n = String.format(SQLConstants.DE_STR_TO_DATE, whereName, f); - whereNameReal = String.format(SQLConstants.UNIX_TIMESTAMP, n); - } + whereNameReal = String.format(SQLConstants.UNIX_TIMESTAMP, whereName); } else { whereNameReal = whereName; } diff --git a/core/core-backend/src/main/java/io/dataease/engine/trans/WhereTree2Str.java b/core/core-backend/src/main/java/io/dataease/engine/trans/WhereTree2Str.java index 7480db3c5e..b9b1f296e3 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/trans/WhereTree2Str.java +++ b/core/core-backend/src/main/java/io/dataease/engine/trans/WhereTree2Str.java @@ -97,10 +97,6 @@ public class WhereTree2Str { String cast = String.format(SQLConstants.CAST, originName, SQLConstants.DEFAULT_INT_FORMAT); whereName = String.format(SQLConstants.FROM_UNIXTIME, cast, SQLConstants.DEFAULT_DATE_FORMAT); } - if (field.getDeExtractType() == 1) { - String f = DateUtils.get_date_format(originName); - whereName = String.format(SQLConstants.DATE_FORMAT, originName, f); - } } else if (field.getDeType() == 2 || field.getDeType() == 3) { if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) { whereName = String.format(SQLConstants.CAST, originName, SQLConstants.DEFAULT_FLOAT_FORMAT); @@ -128,16 +124,7 @@ public class WhereTree2Str { String whereValue = ""; if (field.getDeType() == 1) { - // 规定几种日期格式，一一匹配，匹配到就是该格式 - if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) { - String f = DateUtils.get_date_format(item.getValue()); - whereName = String.format(SQLConstants.DE_STR_TO_DATE, whereName, f); - whereName = String.format(SQLConstants.UNIX_TIMESTAMP, whereName); - } else { - String f = DateUtils.get_date_format(item.getValue()); - whereName = String.format(SQLConstants.DE_STR_TO_DATE, whereName, f); - whereName = String.format(SQLConstants.UNIX_TIMESTAMP, whereName); - } + whereName = String.format(SQLConstants.UNIX_TIMESTAMP, whereName); } if (StringUtils.equalsIgnoreCase(item.getTerm(), "null")) {