From ca7eb9dddce247fcd4c0699301885bde7f0249f6 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期四, 17 十一月 2022 16:57:21 +0800
Subject: [PATCH] 消息查询bug

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

diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
index 3ce4be9..6928066 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -131,10 +131,10 @@
         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="category != null">
+            <if test="categories != null">
                 category = #{categories}
-            </if>>
-            <if test="community_id != null">
+            </if>
+            <if test="communityId != null">
                 and community_id = #{communityId}
             </if>
             <if test="code != null and code !=''">
@@ -143,9 +143,90 @@
             <if test="site != null and site!=''">
                 and site like contact('%',#{site},'%')
             </if>
-            <if test="startTime !='' and endTime !=''">
+            <if test="startTime !='' and endTime !='' and startTime!=null and endTime !=null">
                 and create_time between #{startTime} and #{endTime}
             </if>
         </where>
     </select>
+
+    <select id="selectViolationPage" resultType="com.ycl.vo.casePool.QueryForViolationVO"
+            parameterType="com.ycl.dto.caseHandler.QueryForViolationParam">
+        SELECT
+        t1.`code`,
+        t1.alarm_time,
+        t1.handling_opinion,
+        CASE
+        t1.event_source
+        WHEN 1 THEN
+        "瑙嗛宸℃煡"
+        WHEN 2 THEN
+        "浜哄伐涓婃姤"
+        END AS event_source,
+        t1.site,
+        CASE
+        t1.state
+        WHEN 7 THEN
+        "寰呭鏍�"
+        WHEN 8 THEN
+        "宸插鏍�"
+        END AS state,
+        t3.`name` as categoryName,
+        t4.`name` AS typeName,
+        t5.`name` as gradeName,
+        t2.car_number,
+        t6.region_name as communityName,
+        t7.region_name as streetName,
+        t8.url,
+        t9.address
+        FROM
+        ums_base_case t1
+        LEFT JOIN ums_violations t2 on t1.id=t2.id
+        LEFT JOIN ums_data_dictionary t3 on t3.id=t2.category_id
+        LEFT JOIN ums_data_dictionary t4 on t4.id=t2.type_id
+        LEFT JOIN ums_data_dictionary t5 on t5.id=t2.grade_id
+        LEFT JOIN ums_sccg_region t6 on t6.id=t1.community_id
+        LEFT JOIN ums_sccg_region t7 on t7.id=t1.street_id
+        LEFT JOIN ums_image_resources t8 on t8.belong_to_id=t1.id
+        LEFT JOIN ums_video_point t9 on t9.id=t2.video_point_id
+        <where>
+            t1.state IN (7,8)
+            <if test="queryForViolationParam.eventSource != null">
+                and t1.event_source=#{queryForViolationParam.eventSource}
+            </if>
+            <if test="queryForViolationParam.categoryId != null">
+                and t2.category_id=#{queryForViolationParam.categoryId}
+            </if>
+            <if test="queryForViolationParam.startTime != null and queryForViolationParam.startTime !='' and queryForViolationParam.endTime !=null and queryForViolationParam.endTime !=''">
+                and t1.alarm_time between #{queryForViolationParam.startTime} and #{queryForViolationParam.endTime}
+            </if>
+            <if test="queryForViolationParam.code != null and queryForViolationParam.code != '' ">
+                and t1.code like concat('%',#{queryForViolationParam.code},'%')
+            </if>
+            <if test=" queryForViolationParam.typeId!= null">
+                and t2.type_id=#{v.typeId}
+            </if>
+            <if test="queryForViolationParam.gradeId != null">
+                and t2.grade_id=#{queryForViolationParam.gradeId}
+            </if>
+            <if test="queryForViolationParam.streetId != null">
+                and t1.street_id=#{queryForViolationParam.streetId}
+            </if>
+            <if test="queryForViolationParam.communityId != null">
+                and t1.community_id=#{queryForViolationParam.communityId}
+            </if>
+            <if test="queryForViolationParam.state != null">
+                and t1.state=#{queryForViolationParam.state}
+            </if>
+            <if test="queryForViolationParam.carNumber != null and  queryForViolationParam.carNumber!=''">
+                and t1.car_umber like concat('%',#{queryForViolationParam.carNumber},'%')
+            </if>
+            <if test="queryForViolationParam.videoPointId != null">
+                and t1.video_point_id=#{queryForViolationParam.videoPointId}
+            </if>
+            <if test="queryForViolationParam.handlingOpinion != null and queryForViolationParam.handlingOpinion !=''">
+                and t1.handling_opinion like concat('%',#{queryForViolationParam.handlingOpinion},'%')
+            </if>
+        </where>
+
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0