From 54c4ea3d246763f9941bef0297c7561e5f0d0d15 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期五, 04 十一月 2022 10:27:39 +0800
Subject: [PATCH] 修改bug
---
ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml | 72 +++++++++++++++++++++++++++++++----
1 files changed, 63 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 fd07456..3ce4be9 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -22,6 +22,12 @@
<result column="final_opinion" property="finalOpinion"/>
<result column="create_time" property="createTime"/>
</resultMap>
+ <resultMap type="com.ycl.entity.caseHandler.BaseCase" id="CondMapResultMap" extends="BaseResultMap">
+ <result column="category_text" property="categoryText"/>
+ <result column="street_text" property="streetText"/>
+ <result column="community_text" property="communityText"/>
+ <result column="create_user_text" property="createUserText"/>
+ </resultMap>
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="settingsResultMap" type="com.ycl.vo.IllegalBuildingSettingVO">
@@ -38,20 +44,24 @@
, code, event_source, category, street_id, community_id, site, longitude, latitude, alarm_time, create_user, state, handling_opinion, remark, audit_opinion, final_opinion, create_time
</sql>
- <select id="listViolationsPage" resultType="com.ycl.bo.casePool.CasePoolViolationDO">
+ <select id="listViolationsPage" resultType="com.ycl.vo.casePool.CasePoolViolationVO">
SELECT
+ ubc.`id`,
ubc.`code`,
ubc.event_source,
- uv.category_id,
- uv.type_id,
uv.action_cause,
+ t3.name as category,
+ t4.name as type,
+ t5.region_name as street,
ubc.site,
- ubc.street_id,
ubc.alarm_time,
ubc.close_time
FROM
`ums_base_case` AS ubc
JOIN ums_violations AS uv ON ubc.id = uv.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}
@@ -66,13 +76,14 @@
</select>
- <select id="listIllegalBuildingsPage" resultType="com.ycl.bo.casePool.CasePoolIllegalBuildingDO">
+ <select id="listIllegalBuildingsPage" resultType="com.ycl.vo.casePool.CasePoolIllegalBuildingVO">
SELECT
+ ubc.`id`,
ubc.`code`,
ubc.event_source,
- uib.category_id,
+ t1.name as category,
ubc.site,
- ubc.community_id,
+ t2.region_name as community,
uib.building_high,
uib.building_width,
uib.building_length,
@@ -80,7 +91,9 @@
uib.materials
FROM
`ums_base_case` AS ubc
- JOIN ums_illegal_building AS uib ON ubc.id = uib.base_case_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}
@@ -94,4 +107,45 @@
</where>
</select>
-</mapper>
+
+
+ <select id="selectCondMap" parameterType="map" resultMap="CondMapResultMap">
+ SELECT ubc.*,
+ udd.name category_text,
+ usr.region_name street_text,
+ 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
+ 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>
+
+ <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