From c10d6358b9f014375a13821465bc978d0c0da22e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 29 May 2024 17:17:08 +0800
Subject: [PATCH] 通过E呼即办数据统计
---
src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 104 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
index 14ab067..7f251b8 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
@@ -5,7 +5,7 @@
<!--过滤网格数据-->
<sql id="filterHouseGrid">
<if test="houseParam.roleName!=null and houseParam.roleName!=''">
- <if test="houseParam.roleName=='网格员' and houseParam.userId!='1726859808689696770'">
+ <if test="houseParam.roleName=='wgy' and houseParam.userId!='1726859808689696770'">
<choose>
<when test="list != null and list.size()>0">
and address_code in
@@ -26,7 +26,7 @@
<!--过滤社区数据-->
<sql id="filterCommunity">
<if test="houseParam.roleName!=null and houseParam.roleName!=''">
- <if test="houseParam.roleName=='民警' and houseParam.userId!='1726859808689696770'">
+ <if test="houseParam.roleName=='mj' and houseParam.userId!='1726859808689696770'">
<choose>
<when test="communityList != null and communityList.size()>0">
and nei_code in
@@ -57,15 +57,38 @@
<!--自定义分页查询-->
<select id="selectDoorplateAddressPage" resultType="org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO">
- select * from jczz_doorplate_address where 1=1
+ SELECT
+ jda.*
+ FROM
+ jczz_doorplate_address jda LEFT JOIN jczz_district jd on jda.aoi_code=jd.aoi_code
+ where 1=1
<if test="doorplateAddress.aoiName!=null and doorplateAddress.aoiName!=''">
- and aoi_name like concat('%',#{doorplateAddress.aoiName},'%')
+ and jda.aoi_name like concat('%',#{doorplateAddress.aoiName},'%')
</if>
<if test="doorplateAddress.addressName!=null and doorplateAddress.addressName!=''">
- and address_name like concat('%',#{doorplateAddress.addressName},'%')
+ and jda.address_name like concat('%',#{doorplateAddress.addressName},'%')
</if>
<if test="doorplateAddress.townStreetCode != null and doorplateAddress.townStreetCode != ''">
- and town_street_code like concat('%',#{doorplateAddress.townStreetCode},'%')
+ and jda.town_street_code like concat('%',#{doorplateAddress.townStreetCode},'%')
+ </if>
+
+ <if test="doorplateAddress.houseName != null and doorplateAddress.houseName != ''">
+ and jda.house_name like concat('%',#{doorplateAddress.houseName},'%')
+ </if>
+
+ <if test="doorplateAddress.buildingName != null and doorplateAddress.buildingName != ''">
+ and jda.building_name like concat('%',#{doorplateAddress.buildingName},'%')
+ </if>
+
+ <if test="doorplateAddress.unitName != null and doorplateAddress.unitName != ''">
+ and jda.unit_name like concat('%',#{doorplateAddress.unitName},'%')
+ </if>
+
+ <if test="doorplateAddress.districtIds != null ">
+ and jd.id in
+ <foreach collection="doorplateAddress.districtIds" item="districtId" separator ="," open="(" close=")">
+ #{districtId}
+ </foreach>
</if>
</select>
@@ -84,9 +107,9 @@
<!--过滤网格数据-->
<sql id="filterHouseGridByTownOrCommunity">
- <if test="houseParam.roleName!=null and houseParam.roleName!='' and houseParam.roleName!='系统管理员'">
+ <if test="houseParam.roleName!=null and houseParam.roleName!='' and houseParam.roleName!='admin'">
<choose>
- <when test="houseParam.roleName=='网格员' and houseParam.userId!='1726859808689696770'">
+ <when test="(houseParam.roleName=='wgy' or houseParam.roleName=='wzcj') and houseParam.userId!='1726859808689696770'">
<choose>
<when test="list != null and list.size()>0">
and jg.grid_code in
@@ -115,18 +138,20 @@
and br.name = '万达社区居民委员会'
</if>
<include refid="filterHouseGridByTownOrCommunity"/>
+ group by br.town_code,br.town_name
union
select br.town_code as id,br.town_name as name from jczz_police_affairs_grid jpag
left join blade_region br on jpag.community_code = br.code
- where jpag.is_deleted = 0
+ where jpag.is_deleted = 0 and br.town_code is not null
<include refid="filterCommunityByTownOrCommunity"/>
+ group by br.town_code,br.town_name
</select>
<!--过滤社区数据-->
<sql id="filterCommunityByTownOrCommunity">
<if test="houseParam.roleName!=null and houseParam.roleName!=''">
<choose>
- <when test="houseParam.roleName=='民警' and houseParam.userId!='1726859808689696770'">
+ <when test="houseParam.roleName=='mj'">
<choose>
<when test="communityList != null and communityList.size()>0">
and jpag.jw_grid_code in
@@ -158,7 +183,7 @@
union
select br.village_code as id,br.village_name as name,br.town_code as parentId from jczz_police_affairs_grid jpag
left join blade_region br on jpag.community_code = br.code
- where jpag.is_deleted = 0
+ where jpag.is_deleted = 0 and br.village_code is not null
<include refid="filterCommunityByTownOrCommunity"/>
</select>
@@ -382,7 +407,7 @@
jp.id as cid,jp.*,jp.create_time as pcreateTime,
bu.real_name as createUserName
FROM jczz_doorplate_address jda
- left join jczz_place jp on locate(jda.address_code,jp.house_code)>0 and jp.is_deleted = 0
+ left join jczz_place jp on jda.address_code = jp.house_code= and jp.is_deleted = 0
left join blade_user bu on bu.id = jp.create_user and bu.is_deleted = 0
WHERE 1=1
<if test="vo.stdId != null and vo.stdId != ''">
@@ -570,6 +595,19 @@
<if test="townName!=null and townName!=''">
and jda.town_street_name like concat('%',#{townName},'%')
</if>
+ limit 0,1000
+ </select>
+
+ <!--查询未入库的场所-->
+ <select id="getNotPlaceListCount" resultType="java.lang.Integer">
+ select count(*) from jczz_doorplate_address jda
+ left join jczz_place jp on jda.address_code=jp.house_code and jp.is_deleted = 0
+ where 1=1
+ and (doorplate_type = '小门牌' or (doorplate_type = '中门牌' and address_level = 1))
+ and jp.id is null
+ <if test="townName!=null and townName!=''">
+ and jda.town_street_name like concat('%',#{townName},'%')
+ </if>
</select>
<!--查询场所标准地址数据-->
@@ -651,9 +689,51 @@
</select>
<!--查询地址表详情-->
- <select id="getDoorplateAddressVODetail" resultType="org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO">
- select jda.* from jczz_doorplate_address jda where address_code = #{doorplateAddress.addressCode}
+ <select id="getDoorplateAddressVODetail" resultMap="detailMap">
+ select
+ jda.*,
+ jh.id as hid,
+ jh.name as hname,
+ jh.phone_number,
+ jh.card_no,
+ jh.occupation,
+ jh.current_address,
+ jp.id as pid,
+ jp.principal,
+ jp.principal_phone,
+ jp.principal_id_card,
+ case
+ when jh.id is not null then 1
+ when jp.id is not null then 2
+ when jp.id is not null and jh.id is not null then 3
+ when jp.id is null and jh.id is null then 4
+ end as addType
+ from jczz_doorplate_address jda
+ left join jczz_place jp on jp.house_code = jda.address_code and jp.is_deleted = 0
+ left join jczz_household jh on jh.house_code = jda.address_code and jh.is_deleted = 0 and jh.relationship = 1
+ where address_code = #{doorplateAddress.addressCode}
</select>
+
+ <!--门牌地址详情查询-->
+ <resultMap id="detailMap" type="org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO"
+ autoMapping="true">
+ <id property="id" column="id"/>
+ <association property="place" javaType="org.springblade.modules.place.vo.PlaceVO">
+ <id property="id" column="pid"/>
+ <result property="principal" column="principal"/>
+ <result property="principalPhone" column="principal_phone"/>
+ <result property="principalIdCard" column="principal_id_card"/>
+ </association>
+ <collection property="householdList" javaType="java.util.List"
+ ofType="org.springblade.modules.house.vo.HouseholdVO">
+ <id property="id" column="hid"/>
+ <result property="name" column="hname"/>
+ <result property="phoneNumber" column="phone_number"/>
+ <result property="cardNo" column="card_no"/>
+ <result property="occupation" column="occupation"/>
+ <result property="currentAddress" column="current_address"/>
+ </collection>
+ </resultMap>
<!--查询所有的社区集合信息-->
<select id="getAllCommunityList" resultType="org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity">
@@ -736,4 +816,14 @@
</if>
limit 0,1000
</select>
+
+ <!--查询所有未匹配的网格范围地址数据-->
+ <select id="getDoorplateAddressDetailByHouseId" resultType="org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO">
+ select
+ jda.*
+ from jczz_doorplate_address jda
+ left join jczz_house jh on jh.house_code = jda.address_code and jh.is_deleted = 0
+ where 1=1
+ and jh.id = #{houseId}
+ </select>
</mapper>
--
Gitblit v1.9.3