From 00aeffc8dc71b3c3f3bda647675a747e98c1dd38 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 28 Jun 2022 17:42:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20db2=20=E6=97=B6=E9=97=B4=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../provider/query/db2/Db2QueryProvider.java | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java b/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java index 7ed5689029..5307ebe155 100644 --- a/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java @@ -117,7 +117,9 @@ public class Db2QueryProvider extends QueryProvider { } else { if (f.getType().equalsIgnoreCase("TIME")) { fieldName = String.format(Db2Constants.FORMAT_TIME, originField, Db2Constants.DEFAULT_DATE_FORMAT); - } else { + } else if(f.getType().equalsIgnoreCase("DATE")) { + fieldName = String.format(Db2Constants.FORMAT_DATE, originField, Db2Constants.DEFAULT_DATE_FORMAT); + }else { fieldName = originField; } } @@ -194,7 +196,9 @@ public class Db2QueryProvider extends QueryProvider { } else { if (f.getType().equalsIgnoreCase("TIME")) { fieldName = String.format(Db2Constants.FORMAT_TIME, originField, Db2Constants.DEFAULT_DATE_FORMAT); - } else { + } else if(f.getType().equalsIgnoreCase("DATE")) { + fieldName = String.format(Db2Constants.FORMAT_DATE, originField, Db2Constants.DEFAULT_DATE_FORMAT); + }else { fieldName = originField; } } @@ -857,7 +861,9 @@ public class Db2QueryProvider extends QueryProvider { if (field.getDeExtractType() == DeTypeConstants.DE_TIME) { if (field.getType().equalsIgnoreCase("TIME")) { whereName = String.format(Db2Constants.FORMAT_TIME, originName, Db2Constants.DEFAULT_DATE_FORMAT); - } else { + }else if(field.getType().equalsIgnoreCase("DATE")) { + whereName = String.format(Db2Constants.FORMAT_DATE, originName, Db2Constants.DEFAULT_DATE_FORMAT); + }else { whereName = originName; } } @@ -965,7 +971,9 @@ public class Db2QueryProvider extends QueryProvider { if (field.getDeExtractType() == DeTypeConstants.DE_TIME) { if (field.getType().equalsIgnoreCase("TIME")) { whereName = String.format(Db2Constants.FORMAT_TIME, originName, Db2Constants.DEFAULT_DATE_FORMAT); - } else { + } else if(field.getType().equalsIgnoreCase("DATE")) { + whereName = String.format(Db2Constants.FORMAT_DATE, originName, Db2Constants.DEFAULT_DATE_FORMAT); + }else { whereName = originName; } } @@ -1068,7 +1076,9 @@ public class Db2QueryProvider extends QueryProvider { String format = transDateFormat(x.getDateStyle(), x.getDatePattern()); if (x.getType().equalsIgnoreCase("TIME")) { fieldName = String.format(Db2Constants.FORMAT_TIME, originField, format); - } else { + } else if(x.getType().equalsIgnoreCase("DATE")){ + fieldName = String.format(Db2Constants.FORMAT_DATE, originField, format); + }else { fieldName = String.format(Db2Constants.DATE_FORMAT, originField, format); } } else {