From 411e0231d9ee10c1784799d4da26ce1f7f55bb4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <13281114856@qq.com>
Date: Mon, 8 May 2023 12:44:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8A=A5=E8=A1=A8=E7=BB=9F?=
=?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../module/device/service/impl/DeviceStatServiceImpl.java | 6 +++---
.../resources/sqlmap/module/device/DeviceStatMapperExt.xml | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceStatServiceImpl.java b/device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceStatServiceImpl.java
index 34a60c50..c37c50f6 100644
--- a/device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceStatServiceImpl.java
+++ b/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("涓嶆敮鎸佸綋鍓嶆棩鏈熸牸寮忔煡璇㈢粺璁★紒");
diff --git a/device-manager/src/main/resources/sqlmap/module/device/DeviceStatMapperExt.xml b/device-manager/src/main/resources/sqlmap/module/device/DeviceStatMapperExt.xml
index 27a4e2a7..18cad3bd 100644
--- a/device-manager/src/main/resources/sqlmap/module/device/DeviceStatMapperExt.xml
+++ b/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,
<!-- 鏂板鍑忓皯璁惧鏁伴噺-->
--
2.24.3