From e247e6e01f4dda6e536cd822c25467d1b859cb77 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 08 一月 2024 17:38:07 +0800
Subject: [PATCH] 看板数据
---
ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 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..aebe2af 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -55,7 +55,8 @@
t5.region_name as street,
ubc.site,
ubc.alarm_time,
- ubc.close_time
+ ubc.close_time,
+ ubc.state
FROM
`ums_base_case` AS ubc
JOIN ums_violations AS uv ON ubc.id = uv.id
@@ -63,11 +64,11 @@
LEFT JOIN ums_data_dictionary AS t4 ON uv.type_id = t4.id
LEFT JOIN ums_sccg_region t5 ON ubc.street_id = t5.id
<where>
- <if test="state!=null and state!=6">
- ubc.state=#{state}
- </if>
- <if test="state!=null and state==6">
- ubc.state >=#{state}
+ <if test=" state != null and state.size() > 0">
+ AND ubc.state in
+ <foreach collection="state" index="index" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
</if>
<if test="resource!=null">
and ubc.event_source=#{resource}
@@ -115,18 +116,19 @@
uib.building_width,
uib.building_length,
uib.building_area,
- uib.materials
+ uib.materials,
+ ubc.state
FROM
`ums_base_case` AS ubc
left JOIN ums_illegal_building AS uib ON ubc.id = uib.base_case_id
left JOIN ums_data_dictionary AS t1 ON uib.category_id = t1.id
left JOIN ums_sccg_region t2 ON ubc.community_id = t2.id
<where>
- <if test="state!=null and state!=6">
- ubc.state=#{state}
- </if>
- <if test="state!=null and state==6">
- ubc.state >=#{state}
+ <if test=" state != null and state.size() > 0">
+ AND ubc.state in
+ <foreach collection="state" index="index" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
</if>
<if test="resource!=null">
and ubc.event_source=#{resource}
@@ -282,7 +284,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 +301,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