From 680ead20fbd8c2e2eb7665e493d7ede20061ac7b Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 17 三月 2023 13:57:06 +0800
Subject: [PATCH] 坐标集合字段
---
ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml | 45 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
index 70b64c2..a259595 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -63,14 +63,35 @@
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">
+ <if test="state!=null and state!=6">
ubc.state=#{state}
+ </if>
+ <if test="state!=null and state==6">
+ ubc.state >=#{state}
</if>
<if test="resource!=null">
and ubc.event_source=#{resource}
</if>
<if test="type!=null">
and ubc.category=#{type}
+ </if>
+ <if test="code!=null">
+ and ubc.code=#{code}
+ </if>
+ <if test="categoryBig != null">
+ and t3.name like concat('%', #{categoryBig},'%')
+ </if>
+ <if test="categorySmall != null">
+ and t4.name like concat('%', #{categorySmall},'%')
+ </if>
+ <if test="street != null">
+ and ubc.community_id = #{street}
+ </if>
+ <if test="site">
+ and ubc.site like concat('%', #{site},'%')
+ </if>
+ <if test="startTime !='' and endTime !='' and startTime!=null and endTime !=null">
+ and ubc.create_time between #{startTime} and #{endTime}
</if>
</where>
@@ -95,8 +116,11 @@
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">
+ <if test="state!=null and state!=6">
ubc.state=#{state}
+ </if>
+ <if test="state!=null and state==6">
+ ubc.state >=#{state}
</if>
<if test="resource!=null">
and ubc.event_source=#{resource}
@@ -145,6 +169,7 @@
and t1.create_time between #{startTime} and #{endTime}
</if>
</where>
+ order by t1.alarm_time desc
</select>
<select id="selectViolationPage" resultType="com.ycl.vo.casePool.QueryForViolationVO"
@@ -297,12 +322,26 @@
t1.site AS address,
t2.description,
t3.`name` AS point,
- t4.pic_data AS picture
+ t4.pic_data AS picture,
+ (case
+ WHEN t1.state = 0 THEN '寰呭鐞�'
+ WHEN t1.state = 1 THEN '鎶ヨ'
+ WHEN t1.state = 2 THEN '涓婃姤'
+ WHEN t1.state = 3 THEN '鍐嶅涔�'
+ WHEN t1.state = 4 THEN '鏆備笉澶勭悊'
+ WHEN t1.state = 5 THEN '绔嬫'
+ WHEN t1.state = 6 THEN '璋冨害'
+ WHEN t1.state = 7 THEN '澶勭疆'
+ WHEN t1.state = 8 THEN '鏍告煡'
+ WHEN t1.state = 9 THEN '缁撴'
+ END) `status` ,
+ dd.`name` as grade
FROM
ums_base_case t1
LEFT JOIN ums_violations t2 ON t1.id = t2.id
LEFT JOIN ums_video_point t3 ON t3.id = t2.video_point_id
LEFT JOIN ums_video_alarm_report t4 ON t4.id = t2.video_alarm_report_id
+ LEFT JOIN ums_data_dictionary dd on t2.grade_id = dd.id
<where>
t1.category=1
<if test="beginTime !=''and beginTime!=null and endTime!=''and endTime!=null">
--
Gitblit v1.8.0