From d384786ab5868cd4d856691372eee5359e7d9b2c Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 28 三月 2025 17:48:47 +0800
Subject: [PATCH] 导出新增 连个列，以及同步数据库时点位名修改未成功问题
---
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 9 +++++----
1 files changed, 5 insertions(+), 4 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..045e962 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-->
@@ -513,17 +513,18 @@
u.unit_name AS name,
CONCAT(MONTH(w.create_time), '鏈�') AS months
from
- (select count(m.id) as num from t_monitor m where m.serial_number IN (SELECT p.serial_number from t_yw_unit u,t_yw_point p where p.unit_id = u.id and u.id = 21 AND p.examine_status = 1)
+ (select count(m.id) as num from t_monitor m where m.serial_number IN (SELECT p.serial_number from t_yw_unit u,t_yw_point p where p.unit_id = u.id and u.id = #{unitId} AND p.examine_status = 1)
) as a
join
t_work_order w
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