Lianxun_Java.git

old mode 100644 new mode 100755

			@@ -1,25 +1,27 @@
			<?xml version="1.0" encoding="UTF-8" ?>
			<!DOCTYPE mapper
			PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
			<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
			<mapper namespace="ownerServiceDaoImpl">

			<!-- 保存业主信息 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
			) values (
			#{operate},#{sex},#{name},#{link},#{remark},#{ownerId},#{bId},#{userId},#{age},#{memberId},#{ownerTypeCd},#{communityId},#{idCard},#{state}
			)
			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,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},#{otherAddress},
			#{propertyCertificateNo},#{isEvChargerInstalled},#{householdPoliceStation})
			</insert>


			<!-- 查询业主信息（Business） add by wuxw 2018-07-03 -->
			<select id="getBusinessOwnerInfo" parameterType="Map" resultType="Map">
			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.id_card, t.id_card idCard,t.state
			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.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,16 +66,28 @@
			<if test="ownerTypeCd !=null and ownerTypeCd != ''">
			and t.owner_type_cd= #{ownerTypeCd}
			</if>

			<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
			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.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">
			@@ -115,8 +129,19 @@
			<if test="state !=null and state != ''">
			and t.state= #{state}
			</if>
			<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 -->
			<select id="getOwnerInfo" parameterType="Map" resultType="Map">
			@@ -124,39 +149,62 @@
			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.create_time createTime,t.community_id,
			t.community_id communityId,t.id_card, t.id_card idCard,t.state,td.name ownerTypeName
			from building_owner t,t_dict td
			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.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
			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
			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}
			</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 like concat('%',#{name},'%')
			</if>
			<if test="nameLike !=null and nameLike != ''">
			and t.name like concat('%',#{nameLike},'%')
			</if>
			<if test="link !=null and link != ''">
			and t.link= #{link}
			</if>
			<if test="address !=null and address != ''">
			and t.address= #{address}
			</if>
			<if test="statusCd !=null and statusCd != ''">
			and t.status_cd= #{statusCd}
			@@ -170,14 +218,20 @@
			<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}
			</if>
			<if test="bId !=null and bId != ''">
			and t.b_id= #{bId}
			</if>
			<if test="userId !=null and userId != ''">
			and t.user_id= #{userId}
			<if test="ownerFlag !=null and ownerFlag != ''">
			and t.owner_flag= #{ownerFlag}
			</if>
			<if test="age !=null and age != ''">
			and t.age= #{age}
			@@ -203,32 +257,37 @@
			#{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}
			</if>

			</select>

			<!-- 查询业主信息 add by wuxw 2018-07-03 -->
			<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}
			@@ -240,8 +299,14 @@
			<if test="name !=null and name != ''">
			and t.name like concat('%',#{name},'%')
			</if>
			<if test="nameLike !=null and nameLike != ''">
			and t.name like concat('%',#{nameLike},'%')
			</if>
			<if test="link !=null and link != ''">
			and t.link= #{link}
			</if>
			<if test="address !=null and address != ''">
			and t.address= #{address}
			</if>
			<if test="statusCd !=null and statusCd != ''">
			and t.status_cd= #{statusCd}
			@@ -255,14 +320,20 @@
			<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}
			</if>
			<if test="bId !=null and bId != ''">
			and t.b_id= #{bId}
			</if>
			<if test="userId !=null and userId != ''">
			and t.user_id= #{userId}
			<if test="ownerFlag !=null and ownerFlag != ''">
			and t.owner_flag= #{ownerFlag}
			</if>
			<if test="age !=null and age != ''">
			and t.age= #{age}
			@@ -282,9 +353,34 @@
			<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 -->
			<update id="updateOwnerInfoInstance" parameterType="Map">
			@@ -300,6 +396,12 @@
			</if>
			<if test="link !=null and link != ''">
			, t.link= #{link}
			</if>
			<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}
			@@ -319,6 +421,18 @@
			<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 != ''">
			and t.b_id= #{bId}
			@@ -329,7 +443,6 @@
			<if test="memberId !=null and memberId != ''">
			and t.member_id= #{memberId}
			</if>

			</update>

			<!-- 查询业主数量 add by wuxw 2018-07-03 -->
			@@ -345,6 +458,9 @@
			</if>
			<if test="link !=null and link != ''">
			and t.link= #{link}
			</if>
			<if test="address !=null and address != ''">
			and t.address= #{address}
			</if>
			<if test="statusCd !=null and statusCd != ''">
			and t.status_cd= #{statusCd}
			@@ -364,8 +480,8 @@
			<if test="bId !=null and bId != ''">
			and t.b_id= #{bId}
			</if>
			<if test="userId !=null and userId != ''">
			and t.user_id= #{userId}
			<if test="ownerFlag !=null and ownerFlag != ''">
			and t.owner_flag= #{ownerFlag}
			</if>
			<if test="age !=null and age != ''">
			and t.age= #{age}
			@@ -379,8 +495,21 @@
			<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="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 -->
			@@ -398,6 +527,9 @@
			<if test="link !=null and link != ''">
			and t.link= #{link}
			</if>
			<if test="address !=null and address != ''">
			and t.address= #{address}
			</if>
			<if test="statusCd !=null and statusCd != ''">
			and t.status_cd= #{statusCd}
			</if>
			@@ -416,8 +548,8 @@
			<if test="bId !=null and bId != ''">
			and t.b_id= #{bId}
			</if>
			<if test="userId !=null and userId != ''">
			and t.user_id= #{userId}
			<if test="ownerFlag !=null and ownerFlag != ''">
			and t.owner_flag= #{ownerFlag}
			</if>
			<if test="age !=null and age != ''">
			and t.age= #{age}
			@@ -428,18 +560,32 @@
			<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="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 -->
			<select id="getOwnerInfoByCondition" 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,
			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.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'
			@@ -452,6 +598,9 @@
			<if test="link !=null and link != ''">
			and t.link= #{link}
			</if>
			<if test="address !=null and address != ''">
			and t.address= #{address}
			</if>
			<if test="statusCd !=null and statusCd != ''">
			and t.status_cd= #{statusCd}
			</if>
			@@ -470,8 +619,8 @@
			<if test="bId !=null and bId != ''">
			and t.b_id= #{bId}
			</if>
			<if test="userId !=null and userId != ''">
			and t.user_id= #{userId}
			<if test="ownerFlag !=null and ownerFlag != ''">
			and t.owner_flag= #{ownerFlag}
			</if>
			<if test="age !=null and age != ''">
			and t.age= #{age}
			@@ -488,37 +637,57 @@
			<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="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}
			</if>
			</select>

			<!-- 查询未入驻业主总数 -->
			<select id="queryNoEnterRoomOwnerCount" parameterType="Map" resultType="Map">
			select
			COUNT(1) count
			from
			building_owner o
			left join building_owner_room_rel orr on o.owner_id = orr.owner_id and orr.status_cd = '0'
			select COUNT(1) count
			from building_owner o
			left join building_owner_room_rel orr
			on o.owner_id = orr.owner_id and orr.status_cd = '0'
			where o.status_cd = '0'
			and o.owner_type_cd = '1001'
			and o.community_id = #{communityId}
			and orr.rel_id is null or orr.state in ('2001','2003')
			and orr.rel_id is null
			</select>

			<!-- queryOwnersByRoom -->
			<!-- 根据房屋查询业主信息 -->
			<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,
			r.`room_id` roomId,r.`room_num` roomNum,t.community_id,t.community_id communityId,t.id_card, t.id_card idCard
			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,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`
			<if test="roomId !=null and roomId != ''">
			AND r.`room_id` = #{roomId}
			</if>
			<if test="roomIds != null ">
			<if test="roomIds != null and roomIds.length > 0">
			and r.room_id in
			<foreach collection="roomIds" item="item" open="(" close=")" separator=",">
			#{item}
			@@ -527,6 +696,7 @@
			<if test="communityId !=null and communityId != ''">
			and t.community_id= #{communityId}
			</if>
			and t.owner_type_cd = '1001'
			AND r.`status_cd` = '0'
			AND orr.`status_cd` = '0'
			AND t.`status_cd` = '0'
			@@ -534,16 +704,19 @@

			<!-- 根据停车位查询 -->
			<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,
			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
			AND oc.`status_cd` = '0'
			AND ps.`status_cd` = '0'
			and oc.car_type_cd='1001'
			AND t.`status_cd` = '0'
			<if test="psIds != null ">
			and ps.ps_id in
			@@ -554,8 +727,41 @@
			<if test="psId !=null and psId != ''">
			AND ps.`ps_id` = #{psId}
			</if>

			</select>

			<select id="queryOwnerLogsByRoom" parameterType="Map" resultType="Map">
			SELECT
			bo.owner_id ownerId,
			bo.`name`,
			bo.link,
			t.start_time startTime,
			t.end_time endTime,
			t.create_time createTime,
			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'
			WHERE
			bo.owner_type_cd = '1001'
			AND t.room_id = #{roomId}
			ORDER BY
			t.create_time DESC
			<if test="page != -1 and page != null ">
			limit #{page}, #{row}
			</if>
			</select>

			</mapper>
			<select id="queryOwnerLogsCountByRoom" parameterType="Map" resultType="Map">
			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'
			where bo.owner_type_cd = '1001'
			and t.room_id = #{roomId}
			</select>

			</mapper>