添加报表统计

device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceStatServiceImpl.java

@@ -47,31 +47,31 @@ public class DeviceStatServiceImpl extends AbstractCRUDServiceImpl<DeviceStatDao
                     page.setPrePageResult(1);
                     billInfos = this.getBillInfos(query.getSiteId(), TimeUnitEnum.DAY.getValue(), pageInfo, context);
                     deviceStatEntityResult.setList(billInfos);
-                    deviceStatEntityResult.setPageInfo(pageInfo);
+                    deviceStatEntityResult.setPageInfo(page);
                     break;
                 case 近七天:
                     page.setPrePageResult(7);
                     billInfos = this.getBillInfos(query.getSiteId(), TimeUnitEnum.DAY.getValue(), pageInfo, context);
                     deviceStatEntityResult.setList(billInfos);
-                    deviceStatEntityResult.setPageInfo(pageInfo);
+                    deviceStatEntityResult.setPageInfo(page);
                     break;
                 case 近三十天:
                     page.setPrePageResult(30);
                     billInfos = this.getBillInfos(query.getSiteId(), TimeUnitEnum.DAY.getValue(), pageInfo, context);
                     deviceStatEntityResult.setList(billInfos);
-                    deviceStatEntityResult.setPageInfo(pageInfo);
+                    deviceStatEntityResult.setPageInfo(page);
                     break;
                 case 近三月:
                     page.setPrePageResult(3);
                     billInfos = this.getBillInfos(query.getSiteId(), TimeUnitEnum.MONTH.getValue(), pageInfo, context);
                     deviceStatEntityResult.setList(billInfos);
-                    deviceStatEntityResult.setPageInfo(pageInfo);
+                    deviceStatEntityResult.setPageInfo(page);
                     break;
                 case 今年:
                     page.setPrePageResult(1);
                     billInfos = this.getBillInfos(query.getSiteId(), TimeUnitEnum.YEAR.getValue(), pageInfo, context);
                     deviceStatEntityResult.setList(billInfos);
-                    deviceStatEntityResult.setPageInfo(pageInfo);
+                    deviceStatEntityResult.setPageInfo(page);
                     break;
                 default:
                     break;

device-manager/src/test/java/com/mortals/httpclient/device/DeviceStatController.http

@@ -21,7 +21,7 @@ Content-Type: application/json
     "page":1,
     "size":10,
   "siteId": 1,
-  "selected": 1
+  "selected": 3
 }