diff options
author | Anton Tananaev <anton@traccar.org> | 2022-10-13 10:31:54 -0700 |
---|---|---|
committer | Anton Tananaev <anton@traccar.org> | 2022-10-13 10:31:54 -0700 |
commit | 4c8e98ed409df6e12128591eb1d8d0cf0856deb7 (patch) | |
tree | 83da3517bb14977ab4809aecf3681b777785e83d /src/main/java/org/traccar/reports/EventsReportProvider.java | |
parent | acedd28b8584a18022d9e2343558f9acbad1666f (diff) | |
download | trackermap-server-4c8e98ed409df6e12128591eb1d8d0cf0856deb7.tar.gz trackermap-server-4c8e98ed409df6e12128591eb1d8d0cf0856deb7.tar.bz2 trackermap-server-4c8e98ed409df6e12128591eb1d8d0cf0856deb7.zip |
Refactor database code (fix #4961)
Diffstat (limited to 'src/main/java/org/traccar/reports/EventsReportProvider.java')
-rw-r--r-- | src/main/java/org/traccar/reports/EventsReportProvider.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/org/traccar/reports/EventsReportProvider.java b/src/main/java/org/traccar/reports/EventsReportProvider.java index 878c0265d..d0d4fe8bf 100644 --- a/src/main/java/org/traccar/reports/EventsReportProvider.java +++ b/src/main/java/org/traccar/reports/EventsReportProvider.java @@ -64,7 +64,7 @@ public class EventsReportProvider { return storage.getObjects(Event.class, new Request( new Columns.All(), new Condition.And( - new Condition.Equals("deviceId", "deviceId", deviceId), + new Condition.Equals("deviceId", deviceId), new Condition.Between("eventTime", "from", from, "to", to)), new Order("eventTime"))); } @@ -134,7 +134,7 @@ public class EventsReportProvider { sheetNames.add(WorkbookUtil.createSafeSheetName(deviceEvents.getDeviceName())); if (device.getGroupId() > 0) { Group group = storage.getObject(Group.class, new Request( - new Columns.All(), new Condition.Equals("id", "id", device.getGroupId()))); + new Columns.All(), new Condition.Equals("id", device.getGroupId()))); if (group != null) { deviceEvents.setGroupName(group.getName()); } |