From a1b0e5c618b9cd1c2521be14beec70321232ec1d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 11 十二月 2023 14:27:55 +0800
Subject: [PATCH] 删除注释

---
 ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
index 366f0a5..472f35e 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -282,7 +282,8 @@
         t3.code as videoCode,
         t1.alarm_time as alarmTime,
         t1.alarm_time as currentAlarmTime,
-        t4.algo_name as algoName
+        t4.algo_name as algoName,
+        t4.alarm_name as alarmName
         FROM ums_base_case t1
         LEFT JOIN ums_violations t2 ON t1.id = t2.id
         LEFT JOIN ums_video_point t3 on t2.video_point_id = t3.id
@@ -298,6 +299,9 @@
         <if test="beginTime!=null and beginTime!=''">
             and t1.alarm_time between #{beginTime} and #{endTime}
         </if>
+        <if test="type!=null">
+            and t3.type = #{type}
+        </if>
         group by t1.id
         order by t1.id desc
     </select>

--
Gitblit v1.8.0