添加报表统计

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

@@ -89,11 +89,11 @@ 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),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")));
             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),new OrderCol("createTime")));
+            query.setOrderColList(Arrays.asList(new OrderCol("year", OrderCol.DESCENDING),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"));

device-manager/src/main/resources/config/mybatis-sqlmap-config.xml

@@ -19,7 +19,7 @@
 
 		<plugin interceptor="com.mortals.framework.thirty.mybatis.LogInterceptor">
 			<property name="enableExecutorTime" value="true" />
-			<property name="showSql" value="true" />
+			<property name="showSql" value="false" />
 		</plugin>
 	</plugins>
 </configuration>
\ No newline at end of file