From 488858cfe3382ac91df40f62067291384f15d288 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 07 十一月 2022 15:13:57 +0800
Subject: [PATCH] 驾驶舱接口完善
---
ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
index 924fc2e..3ce4be9 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -59,9 +59,9 @@
FROM
`ums_base_case` AS ubc
JOIN ums_violations AS uv ON ubc.id = uv.id
- JOIN ums_data_dictionary AS t3 ON uv.category_id = t3.id
- JOIN ums_data_dictionary AS t4 ON uv.type_id = t4.id
- JOIN ums_sccg_region t5 ON ubc.street_id = t5.id
+ LEFT JOIN ums_data_dictionary AS t3 ON uv.category_id = t3.id
+ 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">
ubc.state=#{state}
@@ -83,7 +83,7 @@
ubc.event_source,
t1.name as category,
ubc.site,
- t2.region_name as community,
+ t2.region_name as community,
uib.building_high,
uib.building_width,
uib.building_length,
@@ -91,9 +91,9 @@
uib.materials
FROM
`ums_base_case` AS ubc
- JOIN ums_illegal_building AS uib ON ubc.id = uib.base_case_id
- JOIN ums_data_dictionary AS t1 ON uib.category_id = t1.id
- JOIN ums_sccg_region t2 ON ubc.community_id = t2.id
+ 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">
ubc.state=#{state}
@@ -116,11 +116,36 @@
usr2.region_name community_text,
ua.username create_user_text
FROM ums_base_case ubc
- LEFT JOIN ums_data_dictionary udd on ubc.category = udd.id and udd.type_code = '01'
+ LEFT JOIN ums_data_dictionary udd on ubc.category = udd.id
LEFT JOIN ums_sccg_region usr on ubc.street_id = usr.id
LEFT JOIN ums_sccg_region usr2 on ubc.community_id = usr2.id
LEFT JOIN ums_admin ua on ubc.create_user = ua.id
WHERE ubc.`code` = #{code}
</select>
-</mapper>
+ <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="category != null">
+ category = #{categories}
+ </if>>
+ <if test="community_id != null">
+ and community_id = #{communityId}
+ </if>
+ <if test="code != null and code !=''">
+ and code like contact('%',#{code},'%')
+ </if>
+ <if test="site != null and site!=''">
+ and site like contact('%',#{site},'%')
+ </if>
+ <if test="startTime !='' and endTime !=''">
+ and create_time between #{startTime} and #{endTime}
+ </if>
+ </where>
+ </select>
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0