From e3fd4c8824c13857334ac1bb87c70e63706e1775 Mon Sep 17 00:00:00 2001 From: junjun Date: Wed, 17 Apr 2024 13:07:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF=20#9155?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/engine/trans/CustomWhere2Str.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 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 1b8ca9c25d..52cf40e741 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 @@ -86,18 +86,17 @@ public class CustomWhere2Str { res.add("(" + whereName + " IN ('" + String.join("','", request.getEnumCheckField()) + "'))"); } } else { + if (field.getDeType() == 1) { + // 规定几种日期格式，一一匹配，匹配到就是该格式 + whereName = String.format(SQLConstants.UNIX_TIMESTAMP, whereName); + } + List filter = request.getFilter(); for (ChartCustomFilterItemDTO filterItemDTO : filter) { String value = filterItemDTO.getValue(); String whereTerm = Utils.transFilterTerm(filterItemDTO.getTerm()); String whereValue = ""; -// String whereNameReal; - if (field.getDeType() == 1) { - // 规定几种日期格式，一一匹配，匹配到就是该格式 - whereName = String.format(SQLConstants.UNIX_TIMESTAMP, whereName); - } - if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "null")) { whereValue = ""; } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "not_null")) {