diff --git a/pom.xml b/pom.xml index ad30694..f42e76c 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.postgresql postgresql - 42.2.5 + 42.3.1 diff --git a/src/main/java/com/example/services/DatabaseConnectOBI.java b/src/main/java/com/example/services/DatabaseConnectOBI.java index 6087394..5819d22 100644 --- a/src/main/java/com/example/services/DatabaseConnectOBI.java +++ b/src/main/java/com/example/services/DatabaseConnectOBI.java @@ -25,6 +25,7 @@ public class DatabaseConnectOBI implements AutoCloseable { String username = dbProperties.getProperty(environment + ".obi.db.username"); String userpassword = dbProperties.getProperty(environment + ".obi.db.password"); + injectClass(); connection = DriverManager.getConnection(url, username, userpassword); logger.info("OBI Connection OK for user " + username + " on environment " + environment); @@ -66,4 +67,12 @@ public class DatabaseConnectOBI implements AutoCloseable { } return properties; } + + private void injectClass() { + try { + Class.forName("org.postgresql.Driver"); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } + } } \ No newline at end of file diff --git a/src/main/java/com/example/services/OrderService.java b/src/main/java/com/example/services/OrderService.java index d6b8950..79a7bd1 100644 --- a/src/main/java/com/example/services/OrderService.java +++ b/src/main/java/com/example/services/OrderService.java @@ -84,11 +84,11 @@ public class OrderService { } if (minDate != null && !minDate.isEmpty()) { - conditions.add(" oo.transaction_date >= ? "); + conditions.add(" DATE_TRUNC('day', oo.transaction_date) >= ? "); } if (maxDate != null && !maxDate.isEmpty()) { - conditions.add(" oo.transaction_date <= ? "); + conditions.add(" DATE_TRUNC('day', oo.transaction_date) <= ? "); } if (!conditions.isEmpty()) { @@ -131,7 +131,6 @@ public class OrderService { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); if (minDate != null && !minDate.isEmpty()) { - logger.info("minDate: " + minDate); try { java.util.Date parsedMinDate = dateFormat.parse(minDate); java.sql.Date sqlMinDate = new java.sql.Date(parsedMinDate.getTime()); @@ -144,7 +143,6 @@ public class OrderService { } if (maxDate != null && !maxDate.isEmpty()) { - logger.info("maxDate: " + maxDate); try { java.util.Date parsedMaxDate = dateFormat.parse(maxDate); java.sql.Date sqlMaxDate = new java.sql.Date(parsedMaxDate.getTime());