fix App时区

master
luoyang 5 years ago
parent 4b1939fb9f
commit 29283b0066

@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId> <artifactId>manage</artifactId>
<version>1.2.49</version> <version>1.2.51</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

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

Loading…
Cancel
Save