Lianxun_Java.git

old mode 100644 new mode 100755

			@@ -513,7 +513,8 @@
			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_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'
			@@ -582,7 +583,8 @@
			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_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'
			@@ -654,14 +656,16 @@
			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,f.floor_area floorArea,u.unit_area unitArea,td.name
			stateName
			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.`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>
			@@ -691,6 +695,12 @@
			</if>
			<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}
			@@ -800,7 +810,7 @@
			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
			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'