添加报表统计

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

@@ -89,15 +89,15 @@ public class DeviceStatServiceImpl extends AbstractCRUDServiceImpl<DeviceStatDao
         query.setSiteId(siteId);
         if (datePattern == TimeUnitEnum.DAY.getValue()) {
             query.setGroupList(Arrays.asList("day"));
-            query.setOrderColList(Arrays.asList(new OrderCol("day", OrderCol.DESCENDING)));
+            query.setOrderColList(Arrays.asList(new OrderCol("day", OrderCol.DESCENDING),new OrderCol("createTime")));
             statList = this.getDao().getStatList(query, pageInfo);
         } else if (datePattern == TimeUnitEnum.MONTH.getValue()) {
             query.setGroupList(Arrays.asList("month"));
-            query.setOrderColList(Arrays.asList(new OrderCol("month", OrderCol.DESCENDING)));
+            query.setOrderColList(Arrays.asList(new OrderCol("month", OrderCol.DESCENDING),new OrderCol("createTime")));
             statList = this.getDao().getStatList(query, pageInfo);
         } else if (datePattern == TimeUnitEnum.YEAR.getValue()) {
             query.setGroupList(Arrays.asList("year"));
-            query.setOrderColList(Arrays.asList(new OrderCol("year", OrderCol.DESCENDING)));
+            query.setOrderColList(Arrays.asList(new OrderCol("year", OrderCol.DESCENDING),new OrderCol("createTime")));
             statList = this.getDao().getStatList(query, pageInfo);
         } else {
             throw new AppException("不支持当前日期格式查询统计！");

device-manager/src/main/resources/sqlmap/module/device/DeviceStatMapperExt.xml

@@ -14,6 +14,9 @@
         id,
         siteId,
         createTime,
+        year,
+        month,
+        day,
         <!-- 设备总数-->
         max(IFNULL(a.deviceTotalCount, 0)) deviceTotalCount,
         <!-- 新增减少设备数量-->