From 0e12140d6ceac7fa10093df2d3ca395ee1501386 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 07 八月 2024 14:14:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 10 +++++++---
1 files changed, 7 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 be8a21a..62acb31 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -86,6 +86,7 @@
#{id}
</foreach>
</select>
+
<select id="selectTMonitorList" resultType="com.ycl.platform.domain.vo.TMonitorVO">
select m.id, m.serial_number, name, site_type, mac_addr, ip, camera_fun_type, longitude, latitude,
camera_capture_area, on_state, civil_code, integrated_device, camera_brand, address, net_working,
@@ -250,7 +251,11 @@
<delete id="deleteTMonitorById" parameterType="Long">
delete
from t_monitor
- where id = #{id}
+ <where>
+ <if test="id !=null">
+ id = #{id}
+ </if>
+ </where>
</delete>
<delete id="deleteTMonitorByIds" parameterType="String">
@@ -336,12 +341,11 @@
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 p.id = w.point_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 #{dateRange[0]} AND #{dateRange[1]}
</if>
- GROUP BY months
ORDER BY months
</select>
--
Gitblit v1.8.0