From c441ee63996286f6e6bd92ecd51dbf2239d2d8ef Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 29 十一月 2022 16:38:43 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
index 6928066..740b16c 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -125,26 +125,24 @@
<select id="selectBaseCasePage" resultType="com.ycl.entity.caseHandler.BaseCase">
select t1.*,
- t2.name category_text,
t3.region_name community_text
from ums_base_case t1
- left join ums_data_dictionary t2 on t1.category = t2.id
left join ums_sccg_region t3 on t1.community_id=t3.id
<where>
<if test="categories != null">
- category = #{categories}
+ t1.category = #{categories}
</if>
<if test="communityId != null">
- and community_id = #{communityId}
+ and t1.community_id = #{communityId}
</if>
<if test="code != null and code !=''">
- and code like contact('%',#{code},'%')
+ and t1.code like contact('%',#{code},'%')
</if>
<if test="site != null and site!=''">
- and site like contact('%',#{site},'%')
+ and t1.site like contact('%',#{site},'%')
</if>
<if test="startTime !='' and endTime !='' and startTime!=null and endTime !=null">
- and create_time between #{startTime} and #{endTime}
+ and t1.create_time between #{startTime} and #{endTime}
</if>
</where>
</select>
@@ -229,4 +227,28 @@
</where>
</select>
+
+ <select id="selectVideoInspection" resultType="com.ycl.vo.casePool.BaseCaseVO">
+ SELECT
+ t1.`code`,
+ t3.`name`,
+ t3.url_address,
+ t3.longitude,
+ t3.latitude,
+ t4.pic_data,
+ t5.`name` as grade,
+ t6.`name` as street,
+ t7.`name` as community,
+ t1.alarm_time as alarmTime
+ 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
+ LEFT JOIN ums_video_alarm_report t4 on t4.id=t2.video_alarm_report_id
+ LEFT JOIN ums_data_dictionary t5 on t5.id=t2.grade_id
+ LEFT JOIN ums_data_dictionary t6 on t6.id=t1.street_id
+ LEFT JOIN ums_data_dictionary t7 on t7.id=t1.community_id
+ WHERE t1.state=1
+ group by t1.id
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0