From d40a69e7d455c12e32201330a9fbe22a7b6b4b5d Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期四, 29 十二月 2022 14:44:45 +0800
Subject: [PATCH] fix: 获取部门树为启用的
---
ycl-platform/src/main/resources/mapper/trend/TrendAnalysisMapper.xml | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ycl-platform/src/main/resources/mapper/trend/TrendAnalysisMapper.xml b/ycl-platform/src/main/resources/mapper/trend/TrendAnalysisMapper.xml
index 912a7c2..8a74e7e 100644
--- a/ycl-platform/src/main/resources/mapper/trend/TrendAnalysisMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/trend/TrendAnalysisMapper.xml
@@ -6,14 +6,18 @@
SELECT
t2.id,
t2.NAME,
- count( 0 ) AS count
+ count( 0 ) AS count,
+ t2.longitude,
+ t2.latitude
FROM
ums_violations t1
LEFT JOIN ums_video_point t2 ON t2.id = t1.video_point_id
LEFT JOIN ums_video_alarm_report t3 ON t3.id = t1.video_alarm_report_id
<where>
- <if test="tap.startTime!=null and tap.startTime!=''and tap.endTime!=null and tap.endTime!=''" >
+ <if test="tap.startTime!=null and tap.startTime!=''and tap.endTime!=null and tap.endTime!=''">
t3.alarm_time between #{tap.startTime} and #{tap.endTime}
+ </if>
+ and t1.video_point_id IS NOT NULL
</where>
GROUP BY
t1.video_point_id
@@ -31,6 +35,7 @@
<if test="longitude='' and longitude =null and latitude='' and latitude=null">
t2.longitude=#{longitude} and t2.latitude=#{latitude}
</if>
+ and t1.video_point_id IS NOT NULL
</where>
GROUP BY
t1.video_point_id,DATE_FORMAT(t3.alarm_time,"%Y-%m-%d")
--
Gitblit v1.8.0