From b6184e2ddf3db37a94f7efb3b619bbc64642a292 Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期二, 27 一月 2026 18:12:48 +0800
Subject: [PATCH] Z四
---
java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml | 209 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 173 insertions(+), 36 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml
index d7fe4a2..6530d05 100755
--- a/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml
@@ -6,9 +6,11 @@
<!-- 淇濆瓨涓氫富淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveBusinessOwnerInfo" parameterType="Map">
insert into business_building_owner(operate, sex, name, link, remark, owner_id, b_id, user_id, age, member_id,
- owner_type_cd, community_id, id_card, state, owner_flag, address)
+ owner_type_cd, community_id, id_card, state, owner_flag, address,other_address,
+ property_certificate_no,is_ev_charger_installed,household_police_station)
values (#{operate}, #{sex}, #{name}, #{link}, #{remark}, #{ownerId}, #{bId}, #{userId}, #{age}, #{memberId},
- #{ownerTypeCd}, #{communityId}, #{idCard}, #{state}, #{ownerFlag}, #{address})
+ #{ownerTypeCd}, #{communityId}, #{idCard}, #{state}, #{ownerFlag}, #{address},#{otherAddress},
+ #{propertyCertificateNo},#{isEvChargerInstalled},#{householdPoliceStation})
</insert>
<!-- 鏌ヨ涓氫富淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
@@ -16,7 +18,10 @@
select t.operate,t.sex,t.name,t.link,t.remark,t.owner_id,t.owner_id ownerId,t.b_id,t.b_id bId,
t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId,t.owner_type_cd,
t.owner_type_cd ownerTypeCd,t.community_id,t.community_id communityId,t.owner_flag,t.owner_flag ownerFlag,
- t.id_card, t.id_card idCard,t.state,t.address
+ t.id_card, t.id_card idCard,t.state,t.address,
+ t.property_certificate_no,t.property_certificate_no propertyCertificateNo,
+ t.is_ev_charger_installed,t.is_ev_charger_installed isEvChargerInstalled,
+ t.household_police_station,t.household_police_station householdPoliceStation
from business_building_owner t
where 1 =1
<if test="operate !=null and operate != ''">
@@ -64,14 +69,25 @@
<if test="address != null and address != ''">
and t.address= #{address}
</if>
+ <if test="propertyCertificateNo !=null and propertyCertificateNo != ''">
+ and t.property_certificate_no = #{propertyCertificateNo}
+ </if>
+ <if test="isEvChargerInstalled !=null">
+ and t.is_ev_charger_installed= #{isEvChargerInstalled}
+ </if>
+ <if test="householdPoliceStation !=null and householdPoliceStation != ''">
+ and t.household_police_station= #{householdPoliceStation}
+ </if>
</select>
<!-- 淇濆瓨涓氫富淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveOwnerInfoInstance" parameterType="Map">
insert into building_owner(
- sex,name,link,status_cd,remark,owner_id,b_id,user_id,age,member_id,owner_type_cd,community_id,id_card,state,owner_flag,address
+ sex,name,link,status_cd,remark,owner_id,b_id,user_id,age,member_id,owner_type_cd,community_id,id_card,state,owner_flag,address,
+ property_certificate_no,is_ev_charger_installed,household_police_station
) select t.sex,t.name,t.link,'0',t.remark,t.owner_id,t.b_id,t.user_id,t.age,t.member_id,t.owner_type_cd,
- t.community_id communityId,t.id_card,state,t.owner_flag,t.address
+ t.community_id communityId,t.id_card,state,t.owner_flag,t.address,
+ t.property_certificate_no,t.is_ev_charger_installed,t.household_police_station
from business_building_owner t where 1=1
and t.operate= 'ADD'
<if test="sex !=null">
@@ -116,6 +132,15 @@
<if test="address !=null and address != ''">
and t.address= #{address}
</if>
+ <if test="propertyCertificateNo !=null and propertyCertificateNo != ''">
+ and t.property_certificate_no = #{propertyCertificateNo}
+ </if>
+ <if test="isEvChargerInstalled !=null">
+ and t.is_ev_charger_installed= #{isEvChargerInstalled}
+ </if>
+ <if test="householdPoliceStation !=null and householdPoliceStation != ''">
+ and t.household_police_station= #{householdPoliceStation}
+ </if>
</insert>
<!-- 鏌ヨ涓氫富淇℃伅 add by wuxw 2018-07-03 -->
@@ -125,41 +150,53 @@
t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId,t.owner_type_cd,
t.owner_type_cd ownerTypeCd,t.create_time createTime,t.community_id,
t.community_id communityId,t.id_card, t.id_card idCard,t.state,td.name ownerTypeName,
- t.owner_flag,t.owner_flag ownerFlag,t.address
+ t.owner_flag,t.owner_flag ownerFlag,t.address,t.other_address otherAddress,t.person_type personType,t.person_role personRole,
+ t.concact_person concactPerson, t.concact_link concactLink,t.face_url faceUrl,td.name ownerTypeName,
+ tdType.name personTypeName,tdRole.name personRoleName,
+ t.property_certificate_no,t.property_certificate_no propertyCertificateNo,
+ t.is_ev_charger_installed,t.is_ev_charger_installed isEvChargerInstalled,
+ t.household_police_station,t.household_police_station householdPoliceStation
<if test="roomIds != null">
, borr.room_id roomId
</if>
- from building_owner t,t_dict td
+ from building_owner t
+ left join t_dict td on td.table_name = 'building_owner' and td.`table_columns` = 'owner_type_cd' and td.status_cd = t.owner_type_cd
+ left join t_dict tdType on tdType.table_name = 'building_owner' and tdType.`table_columns` = 'person_type' and tdType.status_cd = t.person_type
+ left join t_dict tdRole on tdRole.table_name = 'building_owner' and tdRole.`table_columns` = 'person_role' and tdRole.status_cd = t.person_role
<if test="roomId != null and roomId != ''">
- ,building_owner_room_rel borr
+ left join building_owner_room_rel borr on borr.status_cd = '0' and t.member_id = borr.owner_id
</if>
<if test="roomIds != null ">
- ,building_owner_room_rel borr
+ left join building_owner_room_rel borr on t.member_id = borr.owner_id and borr.status_cd = t.status_cd
</if>
where 1 = 1
<if test="roomId != null and roomId != ''">
- and t.owner_id = borr.owner_id
- and borr.status_cd = t.status_cd
and borr.room_id = #{roomId}
</if>
<if test="roomIds != null">
- and t.owner_id = borr.owner_id
- and borr.status_cd = t.status_cd
and borr.room_id in
<foreach collection="roomIds" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
- and td.table_name = 'building_owner'
- and td.`table_columns` = 'owner_type_cd'
- and td.status_cd = t.owner_type_cd
+ <if test="personType !=null and personType != ''">
+ and t.person_type= #{personType}
+ </if>
+ <if test="personRole !=null and personRole != ''">
+ and t.person_role= #{personRole}
+ </if>
+ <if test="concactPerson !=null and concactPerson != ''">
+ and t.concact_person= #{concactPerson}
+ </if>
+ <if test="concactLink !=null and concactLink != ''">
+ and t.concact_link= #{concactLink}
+ </if>
<if test="sex !=null">
and t.sex= #{sex}
</if>
<if test="name !=null and name != ''">
- and t.name = #{name}
+ and t.name like concat('%',#{name},'%')
</if>
-
<if test="nameLike !=null and nameLike != ''">
and t.name like concat('%',#{nameLike},'%')
</if>
@@ -180,6 +217,12 @@
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
+ </if>
+ <if test="communityIds != null">
+ and t.community_id in
+ <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
</if>
<if test="idCard !=null and idCard != ''">
and t.id_card = #{idCard}
@@ -214,6 +257,15 @@
#{item}
</foreach>
</if>
+ <if test="propertyCertificateNo !=null and propertyCertificateNo != ''">
+ and t.property_certificate_no = #{propertyCertificateNo}
+ </if>
+ <if test="isEvChargerInstalled !=null">
+ and t.is_ev_charger_installed= #{isEvChargerInstalled}
+ </if>
+ <if test="householdPoliceStation !=null and householdPoliceStation != ''">
+ and t.household_police_station= #{householdPoliceStation}
+ </if>
order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
@@ -224,21 +276,18 @@
<select id="getOwnerInfoCount" parameterType="Map" resultType="Map">
select count(1) count
from building_owner t
+ left join t_dict td on td.table_name = 'building_owner' and td.`table_columns` = 'owner_type_cd' and td.status_cd = t.owner_type_cd
<if test="roomId != null and roomId != ''">
- ,building_owner_room_rel borr
+ left join building_owner_room_rel borr on borr.status_cd = '0' and t.owner_id = borr.owner_id
</if>
<if test="roomIds != null ">
- ,building_owner_room_rel borr
+ left join building_owner_room_rel borr on t.owner_id = borr.owner_id and borr.status_cd = t.status_cd
</if>
- where 1 =1
+ where 1 = 1
<if test="roomId != null and roomId != ''">
- and t.owner_id = borr.owner_id
- and borr.status_cd = '0'
and borr.room_id = #{roomId}
</if>
<if test="roomIds != null">
- and t.owner_id = borr.owner_id
- and borr.status_cd = '0'
and borr.room_id in
<foreach collection="roomIds" item="item" open="(" close=")" separator=",">
#{item}
@@ -251,7 +300,7 @@
and t.name like concat('%',#{name},'%')
</if>
<if test="nameLike !=null and nameLike != ''">
- and t.name like concat('%',#{name},'%')
+ and t.name like concat('%',#{nameLike},'%')
</if>
<if test="link !=null and link != ''">
and t.link= #{link}
@@ -270,6 +319,12 @@
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
+ </if>
+ <if test="communityIds != null">
+ and t.community_id in
+ <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
</if>
<if test="idCard !=null and idCard != ''">
and t.id_card = #{idCard}
@@ -298,6 +353,33 @@
<if test="ownerTypeCd !=null and ownerTypeCd != ''">
and t.owner_type_cd= #{ownerTypeCd}
</if>
+ <if test="ownerTypeCds != null">
+ and t.owner_type_cd in
+ <foreach collection="ownerTypeCds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="personType !=null and personType != ''">
+ and t.person_type= #{personType}
+ </if>
+ <if test="personRole !=null and personRole != ''">
+ and t.person_role= #{personRole}
+ </if>
+ <if test="concactPerson !=null and concactPerson != ''">
+ and t.concact_person= #{concactPerson}
+ </if>
+ <if test="concactLink !=null and concactLink != ''">
+ and t.concact_link= #{concactLink}
+ </if>
+ <if test="propertyCertificateNo !=null and propertyCertificateNo != ''">
+ and t.property_certificate_no = #{propertyCertificateNo}
+ </if>
+ <if test="isEvChargerInstalled !=null">
+ and t.is_ev_charger_installed= #{isEvChargerInstalled}
+ </if>
+ <if test="householdPoliceStation !=null and householdPoliceStation != ''">
+ and t.household_police_station= #{householdPoliceStation}
+ </if>
</select>
<!-- 淇敼涓氫富淇℃伅 add by wuxw 2018-07-03 -->
@@ -318,6 +400,9 @@
<if test="address !=null and address != ''">
, t.address= #{address}
</if>
+ <if test="otherAddress !=null and otherAddress != ''">
+ ,t.other_address= #{otherAddress}
+ </if>
<if test="remark !=null and remark != ''">
, t.remark= #{remark}
</if>
@@ -335,6 +420,18 @@
</if>
<if test="idCard !=null and idCard != ''">
, t.id_card = #{idCard}
+ </if>
+ <if test="personRole !=null and personRole != ''">
+ , t.personRole = #{personRole}
+ </if>
+ <if test="propertyCertificateNo !=null and propertyCertificateNo != ''">
+ ,t.property_certificate_no = #{propertyCertificateNo}
+ </if>
+ <if test="isEvChargerInstalled !=null">
+ ,t.is_ev_charger_installed = #{isEvChargerInstalled}
+ </if>
+ <if test="householdPoliceStation !=null and householdPoliceStation != ''">
+ ,t.household_police_station = #{householdPoliceStation}
</if>
where 1=1
<if test="bId !=null and bId != ''">
@@ -404,6 +501,15 @@
#{item}
</foreach>
</if>
+ <if test="propertyCertificateNo !=null and propertyCertificateNo != ''">
+ and t.property_certificate_no = #{propertyCertificateNo}
+ </if>
+ <if test="isEvChargerInstalled !=null">
+ and t.is_ev_charger_installed= #{isEvChargerInstalled}
+ </if>
+ <if test="householdPoliceStation !=null and householdPoliceStation != ''">
+ and t.household_police_station= #{householdPoliceStation}
+ </if>
</select>
<!-- 鏌ヨ涓氫富鏁伴噺 add by wuxw 2018-07-03 -->
@@ -460,6 +566,15 @@
#{item}
</foreach>
</if>
+ <if test="propertyCertificateNo !=null and propertyCertificateNo != ''">
+ and t.property_certificate_no = #{propertyCertificateNo}
+ </if>
+ <if test="isEvChargerInstalled !=null">
+ and t.is_ev_charger_installed= #{isEvChargerInstalled}
+ </if>
+ <if test="householdPoliceStation !=null and householdPoliceStation != ''">
+ and t.household_police_station= #{householdPoliceStation}
+ </if>
</select>
<!-- 鏌ヨ涓氫富淇℃伅 add by wuxw 2018-07-03 -->
@@ -467,7 +582,10 @@
select t.sex,t.name,t.link,t.status_cd,t.status_cd statusCd,t.remark,t.owner_id,t.owner_id ownerId,t.b_id,t.b_id
bId,t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId,
t.owner_type_cd,t.owner_type_cd ownerTypeCd,t.community_id,
- t.community_id communityId,t.id_card, t.id_card idCard,t.address
+ t.community_id communityId,t.id_card, t.id_card idCard,t.address,t.other_address otherAddress,
+ t.property_certificate_no,t.property_certificate_no propertyCertificateNo,
+ t.is_ev_charger_installed,t.is_ev_charger_installed isEvChargerInstalled,
+ t.household_police_station,t.household_police_station householdPoliceStation
FROM building_owner t
WHERE
t.`status_cd` = '0'
@@ -525,6 +643,15 @@
#{item}
</foreach>
</if>
+ <if test="propertyCertificateNo !=null and propertyCertificateNo != ''">
+ and t.property_certificate_no = #{propertyCertificateNo}
+ </if>
+ <if test="isEvChargerInstalled !=null">
+ and t.is_ev_charger_installed= #{isEvChargerInstalled}
+ </if>
+ <if test="householdPoliceStation !=null and householdPoliceStation != ''">
+ and t.household_police_station= #{householdPoliceStation}
+ </if>
order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
@@ -547,9 +674,13 @@
<!-- 鏍规嵁鎴垮眿鏌ヨ涓氫富淇℃伅 -->
<select id="queryOwnersByRoom" parameterType="Map" resultType="Map">
SELECT t.sex,t.name,t.link,t.status_cd,t.status_cd statusCd,t.remark,t.owner_id,t.owner_id ownerId,t.b_id,t.b_id
- bId,t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId,t.owner_type_cd,t.owner_type_cd ownerTypeCd,
+ bId,t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId,t.owner_type_cd,t.owner_type_cd
+ ownerTypeCd,
r.`room_id` roomId,r.`room_num` roomNum,t.community_id,t.community_id communityId,t.id_card, t.id_card
- idCard,orr.start_time startTime ,orr.end_time endTime,t.address
+ idCard,orr.start_time startTime ,orr.end_time endTime,t.address,t.other_address otherAddress,
+ t.property_certificate_no,t.property_certificate_no propertyCertificateNo,
+ t.is_ev_charger_installed,t.is_ev_charger_installed isEvChargerInstalled,
+ t.household_police_station,t.household_police_station householdPoliceStation
FROM building_room r,building_owner_room_rel orr,building_owner t
WHERE r.`room_id` = orr.`room_id`
AND orr.`owner_id` = t.`owner_id`
@@ -574,9 +705,12 @@
<!-- 鏍规嵁鍋滆溅浣嶆煡璇� -->
<select id="queryOwnersByParkingSpace" parameterType="Map" resultType="Map">
select ps.num,ps.ps_id psId,t.sex,t.name,t.link,t.status_cd,t.status_cd statusCd,t.remark,t.owner_id,t.owner_id
- ownerId,t.b_id,t.b_id bId,t.address,
+ ownerId,t.b_id,t.b_id bId,t.address,t.other_address otherAddress,
t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId,
- t.owner_type_cd,t.owner_type_cd ownerTypeCd,t.id_card, t.id_card idCard
+ t.owner_type_cd,t.owner_type_cd ownerTypeCd,t.id_card, t.id_card idCard,
+ t.property_certificate_no,t.property_certificate_no propertyCertificateNo,
+ t.is_ev_charger_installed,t.is_ev_charger_installed isEvChargerInstalled,
+ t.household_police_station,t.household_police_station householdPoliceStation
from p_parking_space ps , owner_car oc,building_owner t
where ps.ps_id = oc.ps_id
and oc.owner_id = t.owner_id
@@ -603,11 +737,14 @@
t.start_time startTime,
t.end_time endTime,
t.create_time createTime,
- t.room_id roomId
+ t.room_id roomId,
+ t.status_cd statusCd,
+ bo.property_certificate_no,bo.property_certificate_no propertyCertificateNo,
+ bo.is_ev_charger_installed,bo.is_ev_charger_installed isEvChargerInstalled,
+ bo.household_police_station,bo.household_police_station householdPoliceStation
FROM
building_owner_room_rel t
- INNER JOIN building_owner bo ON t.owner_id = bo.owner_id AND bo.status_cd = '0' AND bo.community_id =
- #{communityId}
+ INNER JOIN building_owner bo ON t.owner_id = bo.owner_id AND bo.status_cd = '0'
WHERE
bo.owner_type_cd = '1001'
AND t.room_id = #{roomId}
@@ -622,9 +759,9 @@
select COUNT(1) count
from building_owner_room_rel t
inner join building_owner bo
- on t.owner_id = bo.owner_id and bo.status_cd = '0' and bo.community_id = #{communityId}
+ on t.owner_id = bo.owner_id and bo.status_cd = '0'
where bo.owner_type_cd = '1001'
and t.room_id = #{roomId}
</select>
-</mapper>
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0