From a1278f8b1edebde8114ca4add0f32d74495a835b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 20 二月 2025 14:21:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 45 ++++++++++++++++++++++++++++++++-------------
1 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index e18e830..045e962 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -487,26 +487,45 @@
WHERE TIMESTAMPDIFF(DAY, p.recovery_time, NOW()) <= #{time}
]]>
</select>
-
+<!-- 鏌ヨ t_yw_unit 涓璱d 涓猴紵 骞朵笖 t_work_order-->
+<!-- <select id="home" resultType="java.util.Map">-->
+<!-- SELECT-->
+<!-- u.unit_name AS name,-->
+<!-- CONCAT(MONTH(w.create_time), '鏈�') AS months,-->
+<!-- COUNT(w.id) AS num1,-->
+<!-- COUNT(w.id) - COUNT(m.id) AS num2-->
+<!-- FROM-->
+<!-- t_monitor m-->
+<!-- LEFT JOIN t_yw_point p ON m.serial_number = p.serial_number-->
+<!-- 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">-->
+<!-- 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-->
+<!-- ORDER BY months-->
+<!-- </select>-->
<select id="home" resultType="java.util.Map">
- SELECT
+ select count(distinct w.serial_number) as num1,
+ CASE WHEN( a.num -count(distinct w.serial_number))
+ <![CDATA[ < 0 THEN 0 ELSE (a.num -count(distinct w.serial_number)) END as num2 ]]>,
u.unit_name AS name,
- CONCAT(MONTH(w.create_time), '鏈�') AS months,
- COUNT(w.id) AS num1,
- COUNT(m.id) - COUNT(w.id) AS num2
- FROM
- t_monitor m
- LEFT JOIN t_yw_point p ON m.serial_number = p.serial_number
- 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
+ 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 = #{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')
</if>
+ AND w.deleted = 1
GROUP BY months
ORDER BY months
- </select>
-
+</select>
<select id="monitorTotal" resultType="com.ycl.platform.domain.vo.screen.MonitorTotalVO">
SELECT
'video' as type,
--
Gitblit v1.8.0