Compare commits
No commits in common. "0d36bb8a1bf0bf4e3ab1e11d9b1d7af757919f2c" and "ea70d8281c5fd27a5fdcd7c1aa431e9fd4109877" have entirely different histories.
0d36bb8a1b
...
ea70d8281c
2
pom.xml
2
pom.xml
|
|
@ -26,7 +26,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.postgresql</groupId>
|
<groupId>org.postgresql</groupId>
|
||||||
<artifactId>postgresql</artifactId>
|
<artifactId>postgresql</artifactId>
|
||||||
<version>42.3.1</version>
|
<version>42.2.5</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Jersey for JAX-RS (Java API for RESTful Web Services) -->
|
<!-- Jersey for JAX-RS (Java API for RESTful Web Services) -->
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,6 @@ public class DatabaseConnectOBI implements AutoCloseable {
|
||||||
String username = dbProperties.getProperty(environment + ".obi.db.username");
|
String username = dbProperties.getProperty(environment + ".obi.db.username");
|
||||||
String userpassword = dbProperties.getProperty(environment + ".obi.db.password");
|
String userpassword = dbProperties.getProperty(environment + ".obi.db.password");
|
||||||
|
|
||||||
injectClass();
|
|
||||||
connection = DriverManager.getConnection(url, username, userpassword);
|
connection = DriverManager.getConnection(url, username, userpassword);
|
||||||
|
|
||||||
logger.info("OBI Connection OK for user " + username + " on environment " + environment);
|
logger.info("OBI Connection OK for user " + username + " on environment " + environment);
|
||||||
|
|
@ -67,12 +66,4 @@ public class DatabaseConnectOBI implements AutoCloseable {
|
||||||
}
|
}
|
||||||
return properties;
|
return properties;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void injectClass() {
|
|
||||||
try {
|
|
||||||
Class.forName("org.postgresql.Driver");
|
|
||||||
} catch (ClassNotFoundException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
@ -84,11 +84,11 @@ public class OrderService {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (minDate != null && !minDate.isEmpty()) {
|
if (minDate != null && !minDate.isEmpty()) {
|
||||||
conditions.add(" DATE_TRUNC('day', oo.transaction_date) >= ? ");
|
conditions.add(" oo.transaction_date >= ? ");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (maxDate != null && !maxDate.isEmpty()) {
|
if (maxDate != null && !maxDate.isEmpty()) {
|
||||||
conditions.add(" DATE_TRUNC('day', oo.transaction_date) <= ? ");
|
conditions.add(" oo.transaction_date <= ? ");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!conditions.isEmpty()) {
|
if (!conditions.isEmpty()) {
|
||||||
|
|
@ -131,6 +131,7 @@ public class OrderService {
|
||||||
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
|
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
|
||||||
|
|
||||||
if (minDate != null && !minDate.isEmpty()) {
|
if (minDate != null && !minDate.isEmpty()) {
|
||||||
|
logger.info("minDate: " + minDate);
|
||||||
try {
|
try {
|
||||||
java.util.Date parsedMinDate = dateFormat.parse(minDate);
|
java.util.Date parsedMinDate = dateFormat.parse(minDate);
|
||||||
java.sql.Date sqlMinDate = new java.sql.Date(parsedMinDate.getTime());
|
java.sql.Date sqlMinDate = new java.sql.Date(parsedMinDate.getTime());
|
||||||
|
|
@ -143,6 +144,7 @@ public class OrderService {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (maxDate != null && !maxDate.isEmpty()) {
|
if (maxDate != null && !maxDate.isEmpty()) {
|
||||||
|
logger.info("maxDate: " + maxDate);
|
||||||
try {
|
try {
|
||||||
java.util.Date parsedMaxDate = dateFormat.parse(maxDate);
|
java.util.Date parsedMaxDate = dateFormat.parse(maxDate);
|
||||||
java.sql.Date sqlMaxDate = new java.sql.Date(parsedMaxDate.getTime());
|
java.sql.Date sqlMaxDate = new java.sql.Date(parsedMaxDate.getTime());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue