From 3add1f8ab325dff968d5c2b94985700419ea1ccb Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 19 二月 2025 09:46:32 +0800
Subject: [PATCH] 运维监控报表接口统计sql重新编写

---
 ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index aa9bcf4..948a7bd 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -500,7 +500,7 @@
 <!--        LEFT JOIN t_yw_unit u ON p.unit_id = u.id-->
 <!--        LEFT JOIN t_work_order w ON w.serial_number = p.serial_number-->
 <!--        WHERE u.id = #{unitId} AND MONTH(w.create_time) IS NOT NULL-->
-<!--        <if test="dateRange != null and dateRange.size > 0">-->
+<!--       <if test="dateRange != null and dateRange.size > 0">-->
 <!--            AND DATE_FORMAT(w.create_time, '%Y-%m') BETWEEN DATE_FORMAT(#{dateRange[0]}, '%Y-%m') AND DATE_FORMAT(#{dateRange[1]}, '%Y-%m')-->
 <!--        </if>-->
 <!--        GROUP BY months-->
@@ -520,10 +520,11 @@
         JOIN t_yw_unit u ON u.id = w.unit_id
         where w.unit_id=#{unitId}
         <if test="dateRange != null and dateRange.size > 0">
-          AND DATE_FORMAT(w.create_time, '%Y-%m') BETWEEN DATE_FORMAT(#{dateRange[0], '%Y-%m') AND DATE_FORMAT(#{dateRange[1], '%Y-%m')
+            AND DATE_FORMAT(w.create_time, '%Y-%m') BETWEEN DATE_FORMAT(#{dateRange[0]}, '%Y-%m') AND DATE_FORMAT(#{dateRange[1]}, '%Y-%m')
         </if>
-          AND w.deleted = 1
+        AND w.deleted = 1
         GROUP BY months
+        ORDER BY months
 </select>
     <select id="monitorTotal" resultType="com.ycl.platform.domain.vo.screen.MonitorTotalVO">
         SELECT

--
Gitblit v1.8.0