|
|
|
@ -44,14 +44,14 @@ public class AppQueryBean {
|
|
|
|
|
if (begin != null) {
|
|
|
|
|
DateTime fromDate = DateTime.parse(begin, DateTimeFormat.forPattern("yyyyMMdd"))
|
|
|
|
|
.withZoneRetainFields(DateTimeZone.forTimeZone(TimeZone.getTimeZone(StringUtils.isNotBlank(timezone)?timezone:"Australia/Melbourne"))).withZone(DateTimeZone.getDefault());
|
|
|
|
|
params.put("begin", fromDate.toDateTime());
|
|
|
|
|
params.put("from", fromDate.toDateTime());
|
|
|
|
|
params.put("begin", fromDate.toDate());
|
|
|
|
|
params.put("from", fromDate.toDate());
|
|
|
|
|
}
|
|
|
|
|
if (end != null) {
|
|
|
|
|
DateTime toDate = DateTime.parse(end, DateTimeFormat.forPattern("yyyyMMdd"))
|
|
|
|
|
.withZoneRetainFields(DateTimeZone.forTimeZone(TimeZone.getTimeZone(StringUtils.isNotBlank(timezone)?timezone:"Australia/Melbourne"))).withZone(DateTimeZone.getDefault());
|
|
|
|
|
params.put("end", toDate.toDateTime());
|
|
|
|
|
params.put("to", toDate.toDateTime());
|
|
|
|
|
params.put("end", DateUtils.addDays(toDate.toDate(), 1));
|
|
|
|
|
params.put("to", DateUtils.addDays(toDate.toDate(), 1));
|
|
|
|
|
}
|
|
|
|
|
if (gateway != null && gateway.length > 0) {
|
|
|
|
|
List<Integer> tradeTypes = new ArrayList<>();
|
|
|
|
|