Skip to content

D
device-new-platform
Commit e3d8a49b authored by 赵啸非's avatar 赵啸非
Browse files
Options

修改报表查询

parent 903866ee
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 7 deletions
device-manager/src/main/java/com/mortals/xhx/module/device/service/DeviceStatService.java
View file @ e3d8a49b
...@@ -17,6 +17,6 @@ import java.util.List; ...@@ -17,6 +17,6 @@ import java.util.List;
*/ */
public interface DeviceStatService extends ICRUDService<DeviceStatEntity, Long> { public interface DeviceStatService extends ICRUDService<DeviceStatEntity, Long> {
List<DeviceStatEntity> getBillInfos(Long siteId, Integer datePattern, PageInfo pageInfo, Context context); List<DeviceStatEntity> getBillInfos(Long siteId,String createTimeStart, Integer datePattern, PageInfo pageInfo, Context context);
} }
\ No newline at end of file
device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceStatServiceImpl.java
View file @ e3d8a49b
...@@ -45,31 +45,31 @@ public class DeviceStatServiceImpl extends AbstractCRUDServiceImpl<DeviceStatDao ...@@ -45,31 +45,31 @@ public class DeviceStatServiceImpl extends AbstractCRUDServiceImpl<DeviceStatDao
switch (DaySelectEnum.getByValue(query.getSelected())) { switch (DaySelectEnum.getByValue(query.getSelected())) {
case 今天: case 今天:
page.setPrePageResult(1); page.setPrePageResult(1);
billInfos = this.getBillInfos(query.getSiteId(), TimeUnitEnum.DAY.getValue(), page, context); billInfos = this.getBillInfos(query.getSiteId(),query.getCreateTimeStart(), TimeUnitEnum.DAY.getValue(), page, context);
deviceStatEntityResult.setList(billInfos); deviceStatEntityResult.setList(billInfos);
deviceStatEntityResult.setPageInfo(page); deviceStatEntityResult.setPageInfo(page);
break; break;
case 近七天: case 近七天:
page.setPrePageResult(7); page.setPrePageResult(7);
billInfos = this.getBillInfos(query.getSiteId(), TimeUnitEnum.DAY.getValue(), page, context); billInfos = this.getBillInfos(query.getSiteId(),query.getCreateTimeStart(), TimeUnitEnum.DAY.getValue(), page, context);
deviceStatEntityResult.setList(billInfos); deviceStatEntityResult.setList(billInfos);
deviceStatEntityResult.setPageInfo(page); deviceStatEntityResult.setPageInfo(page);
break; break;
case 近三十天: case 近三十天:
page.setPrePageResult(30); page.setPrePageResult(30);
billInfos = this.getBillInfos(query.getSiteId(), TimeUnitEnum.DAY.getValue(), page, context); billInfos = this.getBillInfos(query.getSiteId(),query.getCreateTimeStart(), TimeUnitEnum.DAY.getValue(), page, context);
deviceStatEntityResult.setList(billInfos); deviceStatEntityResult.setList(billInfos);
deviceStatEntityResult.setPageInfo(page); deviceStatEntityResult.setPageInfo(page);
break; break;
case 近三月: case 近三月:
page.setPrePageResult(3); page.setPrePageResult(3);
billInfos = this.getBillInfos(query.getSiteId(), TimeUnitEnum.MONTH.getValue(), page, context); billInfos = this.getBillInfos(query.getSiteId(),query.getCreateTimeStart(), TimeUnitEnum.MONTH.getValue(), page, context);
deviceStatEntityResult.setList(billInfos); deviceStatEntityResult.setList(billInfos);
deviceStatEntityResult.setPageInfo(page); deviceStatEntityResult.setPageInfo(page);
break; break;
case 今年: case 今年:
page.setPrePageResult(1); page.setPrePageResult(1);
billInfos = this.getBillInfos(query.getSiteId(), TimeUnitEnum.YEAR.getValue(), page, context); billInfos = this.getBillInfos(query.getSiteId(),query.getCreateTimeStart(), TimeUnitEnum.YEAR.getValue(), page, context);
deviceStatEntityResult.setList(billInfos); deviceStatEntityResult.setList(billInfos);
deviceStatEntityResult.setPageInfo(page); deviceStatEntityResult.setPageInfo(page);
break; break;
...@@ -83,10 +83,11 @@ public class DeviceStatServiceImpl extends AbstractCRUDServiceImpl<DeviceStatDao ...@@ -83,10 +83,11 @@ public class DeviceStatServiceImpl extends AbstractCRUDServiceImpl<DeviceStatDao
} }
@Override @Override
public List<DeviceStatEntity> getBillInfos(Long siteId, Integer datePattern, PageInfo pageInfo, Context context) { public List<DeviceStatEntity> getBillInfos(Long siteId,String createTimeStart, Integer datePattern, PageInfo pageInfo, Context context) {
List<DeviceStatEntity> statList = new ArrayList<>(); List<DeviceStatEntity> statList = new ArrayList<>();
DeviceStatQuery query = new DeviceStatQuery(); DeviceStatQuery query = new DeviceStatQuery();
query.setSiteId(siteId); query.setSiteId(siteId);
query.setCreateTimeStart(createTimeStart);
if (datePattern == TimeUnitEnum.DAY.getValue()) { if (datePattern == TimeUnitEnum.DAY.getValue()) {
query.setGroupList(Arrays.asList("day")); query.setGroupList(Arrays.asList("day"));
query.setOrderColList(Arrays.asList(new OrderCol("year", OrderCol.DESCENDING),new OrderCol("month", OrderCol.DESCENDING),new OrderCol("day", OrderCol.DESCENDING),new OrderCol("createTime"))); query.setOrderColList(Arrays.asList(new OrderCol("year", OrderCol.DESCENDING),new OrderCol("month", OrderCol.DESCENDING),new OrderCol("day", OrderCol.DESCENDING),new OrderCol("createTime")));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment