Lianxun_Java.git

old mode 100644 new mode 100755

			@@ -7,23 +7,26 @@
			<!-- 保存小区房屋信息 add by wuxw 2018-07-03 -->
			<insert id="saveBusinessRoomInfo" parameterType="Map">
			insert into business_building_room(
			unit_price,section,remark,user_id,room_id,layer,built_up_area,operate,room_num,unit_id,b_id,apartment,state,community_id
			fee_coefficient,section,remark,user_id,room_id,layer,built_up_area,operate,room_num,unit_id,b_id,apartment,state,community_id,
			room_type
			) values (
			#{unitPrice},#{section},#{remark},#{userId},#{roomId},#{layer},#{builtUpArea},#{operate},#{roomNum},#{unitId},#{bId},#{apartment},#{state},#{communityId}
			#{feeCoefficient},#{section},#{remark},#{userId},#{roomId},#{layer},#{builtUpArea},#{operate},#{roomNum},#{unitId},#{bId},#{apartment},#{state},
			#{communityId},#{roomType}
			)
			</insert>


			<!-- 查询小区房屋信息（Business） add by wuxw 2018-07-03 -->
			<select id="getBusinessRoomInfo" parameterType="Map" resultType="Map">
			select t.unit_price,t.unit_price unitPrice,t.section,t.remark,t.user_id,t.user_id userId,t.room_id,t.room_id
			select t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.remark,t.user_id,t.user_id
			userId,t.room_id,t.room_id
			roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.operate,t.room_num,t.room_num
			roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,t.community_id,t.community_id
			communityId
			communityId,t.room_type,t.room_type roomType
			from business_building_room t
			where 1 =1
			<if test="unitPrice !=null and unitPrice != ''">
			and t.unit_price= #{unitPrice}
			<if test="feeCoefficient !=null and feeCoefficient != ''">
			and t.fee_coefficient= #{feeCoefficient}
			</if>
			<if test="section !=null and section != ''">
			and t.section= #{section}
			@@ -61,6 +64,9 @@
			<if test="state !=null and state != ''">
			and t.state= #{state}
			</if>
			<if test="roomType !=null and roomType != ''">
			and t.room_type= #{roomType}
			</if>
			<if test="communityId !=null and communityId != ''">
			and t.community_id= #{communityId}
			</if>
			@@ -71,12 +77,14 @@
			<!-- 保存小区房屋信息至 instance表中 add by wuxw 2018-07-03 -->
			<insert id="saveRoomInfoInstance" parameterType="Map">
			insert into building_room(
			unit_price,section,status_cd,remark,user_id,room_id,layer,built_up_area,room_num,unit_id,b_id,apartment,state,community_id
			fee_coefficient,section,status_cd,remark,user_id,room_id,layer,built_up_area,room_num,unit_id,b_id,apartment,state,community_id,
			room_type
			) select
			t.unit_price,t.section,'0',t.remark,t.user_id,t.room_id,t.layer,t.built_up_area,t.room_num,t.unit_id,t.b_id,t.apartment,t.state,t.community_id
			t.fee_coefficient,t.section,'0',t.remark,t.user_id,t.room_id,t.layer,t.built_up_area,t.room_num,t.unit_id,t.b_id,t.apartment,t.state,t.community_id,
			t.room_type
			from business_building_room t where 1=1
			<if test="unitPrice !=null and unitPrice != ''">
			and t.unit_price= #{unitPrice}
			<if test="feeCoefficient !=null and feeCoefficient != ''">
			and t.fee_coefficient= #{feeCoefficient}
			</if>
			<if test="section !=null and section != ''">
			and t.section= #{section}
			@@ -112,6 +120,9 @@
			<if test="state !=null and state != ''">
			and t.state= #{state}
			</if>
			<if test="roomType !=null and roomType != ''">
			and t.room_type= #{roomType}
			</if>
			<if test="communityId !=null and communityId != ''">
			and t.community_id= #{communityId}
			</if>
			@@ -121,14 +132,14 @@

			<!-- 查询小区房屋信息 add by wuxw 2018-07-03 -->
			<select id="getRoomInfo" parameterType="Map" resultType="Map">
			select t.unit_price,t.unit_price unitPrice,t.section,t.status_cd,t.status_cd
			select t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd
			statusCd,t.remark,t.user_id,t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area
			builtUpArea,t.room_num,t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id
			bId,t.apartment,t.state,t.community_id,t.community_id communityId
			bId,t.apartment,t.state,t.community_id,t.community_id communityId,t.room_type,t.room_type roomType
			from building_room t
			where 1 =1
			<if test="unitPrice !=null and unitPrice != ''">
			and t.unit_price= #{unitPrice}
			<if test="feeCoefficient !=null and feeCoefficient != ''">
			and t.fee_coefficient= #{feeCoefficient}
			</if>
			<if test="section !=null and section != ''">
			and t.section= #{section}
			@@ -173,6 +184,9 @@
			<if test="state !=null and state != ''">
			and t.state= #{state}
			</if>
			<if test="roomType !=null and roomType != ''">
			and t.room_type= #{roomType}
			</if>
			<if test="communityId !=null and communityId != ''">
			and t.community_id= #{communityId}
			</if>
			@@ -191,8 +205,8 @@
			<if test="newBId != null and newBId != ''">
			,t.b_id = #{newBId}
			</if>
			<if test="unitPrice !=null and unitPrice != ''">
			, t.unit_price= #{unitPrice}
			<if test="feeCoefficient !=null">
			, t.fee_coefficient= #{feeCoefficient}
			</if>
			<if test="section !=null and section != ''">
			, t.section= #{section}
			@@ -239,8 +253,8 @@
			select count(1) count
			from building_room t
			where 1 =1
			<if test="unitPrice !=null and unitPrice != ''">
			and t.unit_price= #{unitPrice}
			<if test="feeCoefficient !=null and feeCoefficient != ''">
			and t.fee_coefficient= #{feeCoefficient}
			</if>
			<if test="section !=null and section != ''">
			and t.section= #{section}
			@@ -280,6 +294,9 @@
			</if>
			<if test="communityId !=null and communityId != ''">
			and t.community_id= #{communityId}
			</if>
			<if test="roomType !=null and roomType != ''">
			and t.room_type= #{roomType}
			</if>


			@@ -289,23 +306,20 @@
			<!-- 查询小区房屋数量 add by wuxw 2018-07-03 -->
			<select id="queryRoomsByCommunityIdCount" parameterType="Map" resultType="Map">
			select count(1) count
			FROM building_room t,s_community c,s_community_member cm,building_unit u,f_floor f
			FROM building_room t
			inner join building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
			inner JOIN f_floor f on u.`floor_id` = f.`floor_id` AND f.`community_id` = t.`community_id` AND f.`status_cd` =
			'0'
			left join t_dict td on t.state = td.status_cd and td.table_name = 'building_room' and td.table_columns = 'state'
			WHERE 1 =1
			AND t.`unit_id` = u.`unit_id`
			AND u.`floor_id` = f.`floor_id`
			AND f.`floor_id` = cm.`member_id`
			AND cm.`community_id` = c.`community_id`
			AND cm.`member_type_cd` = '390001200004'
			AND c.`status_cd` = '0'
			AND cm.`status_cd` = '0'
			AND u.`status_cd` = '0'
			AND f.`status_cd` = '0'
			AND c.`community_id` = #{communityId}
			AND t.`community_id` = #{communityId}
			and t.status_cd ='0'
			<if test="floorId !=null and floorId != ''">
			and f.`floor_id`= #{floorId}
			</if>
			<if test="unitPrice !=null and unitPrice != ''">
			and t.unit_price= #{unitPrice}

			<if test="feeCoefficient !=null and feeCoefficient != ''">
			and t.fee_coefficient= #{feeCoefficient}
			</if>
			<if test="section !=null and section != ''">
			and t.section= #{section}
			@@ -316,9 +330,7 @@
			<if test="remark !=null and remark != ''">
			and t.remark= #{remark}
			</if>
			<if test="userId !=null and userId != ''">
			and t.user_id= #{userId}
			</if>

			<if test="roomId !=null and roomId != ''">
			and t.room_id= #{roomId}
			</if>
			@@ -343,8 +355,24 @@
			<if test="state !=null and state != ''">
			and t.state= #{state}
			</if>
			<if test="roomType !=null and roomType != ''">
			and t.room_type= #{roomType}
			</if>
			<if test="states != null">
			and t.state in
			<foreach collection="states" item="item" open="(" close=")" separator=",">
			#{item}
			</foreach>
			</if>
			<if test="communityId !=null and communityId != ''">
			and t.community_id= #{communityId}
			</if>

			<if test="floorNum !=null and floorNum != ''">
			and f.`floor_num`= #{floorNum}
			</if>
			<if test="unitNum !=null and unitNum != ''">
			and u.unit_num= #{unitNum}
			</if>


			@@ -355,27 +383,18 @@
			select
			count(1) count
			FROM
			building_room t,
			s_community c,
			s_community_member cm,
			building_unit u,
			f_floor f
			building_room t
			INNER JOIN building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
			INNER JOIN f_floor f on u.`floor_id` = f.`floor_id` and f.`community_id` = t.`community_id` and f.`status_cd` =
			'0'
			LEFT JOIN building_owner_room_rel borr on borr.`room_id` = t.`room_id` and borr.`status_cd` = '0'
			WHERE 1 =1
			AND t.`unit_id` = u.`unit_id`
			AND u.`floor_id` = f.`floor_id`
			AND f.`floor_id` = cm.`member_id`
			AND cm.`community_id` = c.`community_id`
			AND cm.`member_type_cd` = '390001200004'
			AND c.`status_cd` = '0'
			AND cm.`status_cd` = '0'
			AND u.`status_cd` = '0'
			AND f.`status_cd` = '0'
			AND c.`community_id` = #{communityId}
			AND t.`community_id` = #{communityId}
			<if test="floorId !=null and floorId != ''">
			and f.`floor_id`= #{floorId}
			</if>
			<if test="unitPrice !=null and unitPrice != ''">
			and t.unit_price= #{unitPrice}
			<if test="feeCoefficient !=null and feeCoefficient != ''">
			and t.fee_coefficient= #{feeCoefficient}
			</if>
			<if test="section !=null and section != ''">
			and t.section= #{section}
			@@ -413,14 +432,13 @@
			<if test="state !=null and state != ''">
			and t.state= #{state}
			</if>
			<if test="roomType !=null and roomType != ''">
			and t.room_type= #{roomType}
			</if>
			<if test="communityId !=null and communityId != ''">
			and t.community_id= #{communityId}
			</if>
			AND NOT EXISTS(
			SELECT 1 FROM building_owner_room_rel borr
			WHERE borr.`status_cd` = '0'
			AND borr.`room_id` = t.`room_id`
			)
			and borr.`room_id` is null


			</select>
			@@ -430,27 +448,18 @@
			select
			count(1) count
			FROM
			building_room t,
			s_community c,
			s_community_member cm,
			building_unit u,
			f_floor f
			building_room t
			INNER JOIN building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
			INNER JOIN f_floor f on u.`floor_id` = f.`floor_id` and f.`community_id` = t.`community_id` and f.`status_cd` =
			'0'
			LEFT JOIN building_owner_room_rel borr on borr.`room_id` = t.`room_id` and borr.`status_cd` = '0'
			WHERE 1 =1
			AND t.`unit_id` = u.`unit_id`
			AND u.`floor_id` = f.`floor_id`
			AND f.`floor_id` = cm.`member_id`
			AND cm.`community_id` = c.`community_id`
			AND cm.`member_type_cd` = '390001200004'
			AND c.`status_cd` = '0'
			AND cm.`status_cd` = '0'
			AND u.`status_cd` = '0'
			AND f.`status_cd` = '0'
			AND c.`community_id` = #{communityId}
			AND t.`community_id` = #{communityId}
			<if test="floorId !=null and floorId != ''">
			and f.`floor_id`= #{floorId}
			</if>
			<if test="unitPrice !=null and unitPrice != ''">
			and t.unit_price= #{unitPrice}
			<if test="feeCoefficient !=null and feeCoefficient != ''">
			and t.fee_coefficient= #{feeCoefficient}
			</if>
			<if test="section !=null and section != ''">
			and t.section= #{section}
			@@ -488,40 +497,37 @@
			<if test="state !=null and state != ''">
			and t.state= #{state}
			</if>
			<if test="roomType !=null and roomType != ''">
			and t.room_type= #{roomType}
			</if>
			<if test="communityId !=null and communityId != ''">
			and t.community_id= #{communityId}
			</if>
			AND EXISTS(
			SELECT 1 FROM building_owner_room_rel borr
			WHERE borr.`status_cd` = '0'
			AND borr.`room_id` = t.`room_id`
			)
			AND borr.`room_id` is not null


			</select>

			<!-- 查询小区房屋信息 add by wuxw 2018-07-03 -->
			<select id="getRoomInfoWithOutSellByCommunityId" parameterType="Map" resultType="Map">
			SELECT t.unit_price,t.unit_price unitPrice,t.section,t.status_cd,t.status_cd statusCd,t.remark,t.user_id,
			SELECT t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd
			statusCd,t.remark,t.user_id,
			t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,
			t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num` unitNum
			FROM building_room t,s_community c,s_community_member cm,building_unit u,f_floor f
			t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num` unitNum,
			t.room_type roomType,t.room_type
			FROM
			building_room t
			INNER JOIN building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
			INNER JOIN f_floor f on u.`floor_id` = f.`floor_id` and f.`community_id` = t.`community_id` and f.`status_cd` =
			'0'
			LEFT JOIN building_owner_room_rel borr on borr.`room_id` = t.`room_id` and borr.`status_cd` = '0'
			WHERE 1 =1
			AND t.`unit_id` = u.`unit_id`
			AND u.`floor_id` = f.`floor_id`
			AND f.`floor_id` = cm.`member_id`
			AND cm.`community_id` = c.`community_id`
			AND cm.`member_type_cd` = '390001200004'
			AND c.`status_cd` = '0'
			AND cm.`status_cd` = '0'
			AND u.`status_cd` = '0'
			AND f.`status_cd` = '0'
			AND c.`community_id` = #{communityId}
			AND t.`community_id` = #{communityId}
			<if test="floorId !=null and floorId != ''">
			and f.`floor_id`= #{floorId}
			</if>
			<if test="unitPrice !=null and unitPrice != ''">
			and t.unit_price= #{unitPrice}
			<if test="feeCoefficient !=null and feeCoefficient != ''">
			and t.fee_coefficient= #{feeCoefficient}
			</if>
			<if test="section !=null and section != ''">
			and t.section= #{section}
			@@ -559,14 +565,13 @@
			<if test="state !=null and state != ''">
			and t.state= #{state}
			</if>
			<if test="roomType !=null and roomType != ''">
			and t.room_type= #{roomType}
			</if>
			<if test="communityId !=null and communityId != ''">
			and t.community_id= #{communityId}
			</if>
			AND NOT EXISTS(
			SELECT 1 FROM building_owner_room_rel borr
			WHERE borr.`status_cd` = '0'
			AND borr.`room_id` = t.`room_id`
			)
			and borr.`room_id` is null
			<if test="page != -1 and page != null">
			limit #{page},#{row}
			</if>
			@@ -575,26 +580,24 @@

			<!-- 查询小区房屋信息 add by wuxw 2018-07-03 -->
			<select id="getRoomInfoWithSellByCommunityId" parameterType="Map" resultType="Map">
			SELECT t.unit_price,t.unit_price unitPrice,t.section,t.status_cd,t.status_cd statusCd,t.remark,t.user_id,
			SELECT t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd
			statusCd,t.remark,t.user_id,
			t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,
			t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num` unitNum
			FROM building_room t,s_community c,s_community_member cm,building_unit u,f_floor f
			t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num` unitNum,
			t.room_type roomType,t.room_type
			FROM
			building_room t
			INNER JOIN building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
			INNER JOIN f_floor f on u.`floor_id` = f.`floor_id` and f.`community_id` = t.`community_id` and f.`status_cd` =
			'0'
			LEFT JOIN building_owner_room_rel borr on borr.`room_id` = t.`room_id` and borr.`status_cd` = '0'
			WHERE 1 =1
			AND t.`unit_id` = u.`unit_id`
			AND u.`floor_id` = f.`floor_id`
			AND f.`floor_id` = cm.`member_id`
			AND cm.`community_id` = c.`community_id`
			AND cm.`member_type_cd` = '390001200004'
			AND c.`status_cd` = '0'
			AND cm.`status_cd` = '0'
			AND u.`status_cd` = '0'
			AND f.`status_cd` = '0'
			AND c.`community_id` = #{communityId}
			AND t.`community_id` = #{communityId}
			<if test="floorId !=null and floorId != ''">
			and f.`floor_id`= #{floorId}
			</if>
			<if test="unitPrice !=null and unitPrice != ''">
			and t.unit_price= #{unitPrice}
			<if test="feeCoefficient !=null and feeCoefficient != ''">
			and t.fee_coefficient= #{feeCoefficient}
			</if>
			<if test="section !=null and section != ''">
			and t.section= #{section}
			@@ -632,14 +635,13 @@
			<if test="state !=null and state != ''">
			and t.state= #{state}
			</if>
			<if test="roomType !=null and roomType != ''">
			and t.room_type= #{roomType}
			</if>
			<if test="communityId !=null and communityId != ''">
			and t.community_id= #{communityId}
			</if>
			AND EXISTS(
			SELECT 1 FROM building_owner_room_rel borr
			WHERE borr.`status_cd` = '0'
			AND borr.`room_id` = t.`room_id`
			)
			AND borr.`room_id` is not null
			<if test="page != -1 and page != null">
			limit #{page},#{row}
			</if>
			@@ -649,27 +651,29 @@

			<!-- 查询小区房屋信息 add by wuxw 2018-07-03 -->
			<select id="getRoomInfoByCommunityId" parameterType="Map" resultType="Map">
			SELECT t.unit_price,t.unit_price unitPrice,t.section,t.status_cd,t.status_cd statusCd,t.remark,t.user_id,
			SELECT t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd
			statusCd,t.remark,t.user_id,
			t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,
			t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num` unitNum,
			u.unit_id unitId,f.floor_id floorId,f.floor_num floorNum
			FROM building_room t,s_community c,s_community_member cm,building_unit u,f_floor f
			u.unit_id unitId,f.floor_id floorId,f.floor_num floorNum,f.floor_area floorArea,u.unit_area unitArea,td.name
			stateName,t.room_type roomType,t.room_type,t.`community_id` communityId
			FROM building_room t
			inner join building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
			inner JOIN f_floor f on u.`floor_id` = f.`floor_id` AND f.`community_id` = t.`community_id` AND f.`status_cd` =
			'0'
			left join t_dict td on t.state = td.status_cd and td.table_name = 'building_room' and td.table_columns = 'state'
			WHERE 1 =1
			AND t.`unit_id` = u.`unit_id`
			AND u.`floor_id` = f.`floor_id`
			AND f.`floor_id` = cm.`member_id`
			AND cm.`community_id` = c.`community_id`
			AND cm.`member_type_cd` = '390001200004'
			AND c.`status_cd` = '0'
			AND cm.`status_cd` = '0'
			AND u.`status_cd` = '0'
			AND f.`status_cd` = '0'
			AND c.`community_id` = #{communityId}
			<if test="floorId !=null and floorId != ''">
			AND t.`community_id` = #{communityId}
			</if>
			<if test="floorId !=null and floorId != ''">
			and f.`floor_id`= #{floorId}
			</if>
			<if test="unitPrice !=null and unitPrice != ''">
			and t.unit_price= #{unitPrice}
			<if test="floorNum !=null and floorNum != ''">
			and f.`floor_num`= #{floorNum}
			</if>
			<if test="feeCoefficient !=null and feeCoefficient != ''">
			and t.fee_coefficient= #{feeCoefficient}
			</if>
			<if test="section !=null and section != ''">
			and t.section= #{section}
			@@ -679,9 +683,6 @@
			</if>
			<if test="remark !=null and remark != ''">
			and t.remark= #{remark}
			</if>
			<if test="userId !=null and userId != ''">
			and t.user_id= #{userId}
			</if>
			<if test="roomId !=null and roomId != ''">
			and t.room_id= #{roomId}
			@@ -695,6 +696,12 @@
			<if test="layer !=null and layer != ''">
			and t.layer= #{layer}
			</if>
			<if test="layers != null">
			and t.layer in
			<foreach collection="layers" item="item" open="(" close=")" separator=",">
			#{item}
			</foreach>
			</if>
			<if test="builtUpArea !=null and builtUpArea != ''">
			and t.built_up_area= #{builtUpArea}
			</if>
			@@ -703,6 +710,9 @@
			</if>
			<if test="unitId !=null and unitId != ''">
			and t.unit_id= #{unitId}
			</if>
			<if test="unitNum !=null and unitNum != ''">
			and u.unit_num= #{unitNum}
			</if>
			<if test="bId !=null and bId != ''">
			and t.b_id= #{bId}
			@@ -713,9 +723,19 @@
			<if test="state !=null and state != ''">
			and t.state= #{state}
			</if>
			<if test="roomType !=null and roomType != ''">
			and t.room_type= #{roomType}
			</if>
			<if test="states != null">
			and t.state in
			<foreach collection="states" item="item" open="(" close=")" separator=",">
			#{item}
			</foreach>
			</if>
			<if test="communityId !=null and communityId != ''">
			and t.community_id= #{communityId}
			</if>
			order by f.floor_num ,u.unit_num,t.room_num
			<if test="page != -1 and page != null">
			limit #{page},#{row}
			</if>
			@@ -725,10 +745,11 @@
			<!-- 根据业主查询房屋信息 -->
			<select id="getRoomInfoByOwner" parameterType="Map" resultType="Map">
			SELECT
			t.unit_price,t.unit_price unitPrice,t.section,t.status_cd,t.status_cd statusCd,t.remark,t.user_id,
			t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd
			statusCd,t.remark,t.user_id,
			t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,
			t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num`
			unitNum,f.`floor_num` floorNum
			unitNum,f.`floor_num` floorNum,t.room_type roomType,t.room_type
			FROM
			building_owner bo,building_room t,building_owner_room_rel borr,building_unit u,f_floor f
			WHERE
			@@ -738,10 +759,15 @@
			AND u.`floor_id` = f.`floor_id`
			AND u.`status_cd` = '0'
			AND f.`status_cd` = '0'
			AND borr.`status_cd` = '0'
			AND t.`status_cd` = '0'
			AND bo.`status_cd` = '0'
			AND bo.`owner_type_cd` = '1001'
			<if test="roomType !=null and roomType != ''">
			and t.room_type= #{roomType}
			</if>
			<if test="statusCd !=null and statusCd != ''">
			and borr.`status_cd` = #{statusCd}
			</if>
			<if test="sex !=null ">
			and bo.sex= #{sex}
			</if>
			@@ -751,9 +777,9 @@
			<if test="link !=null and link != ''">
			and bo.link= #{link}
			</if>
			<if test="statusCd !=null and statusCd != ''">
			and bo.status_cd= #{statusCd}
			</if>
			<!-- <if test="statusCd !=null and statusCd != ''">-->
			<!-- and bo.status_cd= #{statusCd}-->
			<!-- </if>-->
			<if test="remark !=null and remark != ''">
			and bo.remark= #{remark}
			</if>
			@@ -776,4 +802,57 @@
			and bo.owner_type_cd= #{ownerTypeCd}
			</if>
			</select>
			</mapper>


			<!-- 查询小区房屋信息 add by wuxw 2018-07-03 -->
			<select id="getRoomInfos" parameterType="Map" resultType="Map">
			SELECT t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd
			statusCd,t.remark,t.user_id,
			t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,
			t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num` unitNum,
			t.room_type roomType,t.room_type,f.floor_num floorNum
			FROM
			building_room t
			INNER JOIN building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
			INNER JOIN f_floor f on u.`floor_id` = f.`floor_id` and f.`community_id` = t.`community_id` and f.`status_cd` =
			'0'
			WHERE t.status_cd= '0'
			<if test="floorId !=null and floorId != ''">
			and f.`floor_id`= #{floorId}
			</if>
			<if test="floorNum !=null and floorNum != ''">
			and f.`floor_num`= #{floorNum}
			</if>
			<if test="unitNum !=null and unitNum != ''">
			and u.`unit_num`= #{unitNum}
			</if>
			<if test="section !=null and section != ''">
			and t.section= #{section}
			</if>
			<if test="roomId !=null and roomId != ''">
			and t.room_id= #{roomId}
			</if>
			<if test="layer !=null and layer != ''">
			and t.layer= #{layer}
			</if>
			<if test="roomNum !=null and roomNum != ''">
			and t.room_num= #{roomNum}
			</if>
			<if test="unitId !=null and unitId != ''">
			and t.unit_id= #{unitId}
			</if>
			<if test="state !=null and state != ''">
			and t.state= #{state}
			</if>
			<if test="roomType !=null and roomType != ''">
			and t.room_type= #{roomType}
			</if>
			<if test="communityId !=null and communityId != ''">
			and t.community_id= #{communityId}
			</if>
			<if test="page != -1 and page != null">
			limit #{page},#{row}
			</if>

			</select>
			</mapper>