| @@ -249,7 +249,8 @@ | |||||
| </update> | </update> | ||||
| <select id="getRentContractList" parameterType="com.iformall.domain.po.WxRentContract" resultType="com.iformall.domain.po.WxRentContract"> | <select id="getRentContractList" parameterType="com.iformall.domain.po.WxRentContract" resultType="com.iformall.domain.po.WxRentContract"> | ||||
| select s.shop_id,s.shop_number,s.building_name building, s.floor_name floor,s.build_area,rc.* from ( | |||||
| select s.shop_id,s.shop_number,s.building_name building, s.floor_name floor,s.build_area,s.floor as floor_id, | |||||
| s.building as building_id,rc.* from ( | |||||
| select s.id shop_id,ms.merchant_id,s.shop_number,b.building_name,f.floor_name,s.build_area | select s.id shop_id,ms.merchant_id,s.shop_number,b.building_name,f.floor_name,s.build_area | ||||
| from wx_shop s | from wx_shop s | ||||
| left join wx_mall_building b on s.building=b.id | left join wx_mall_building b on s.building=b.id | ||||
| @@ -262,10 +263,10 @@ | |||||
| and s.shop_number like concat('%', #{shopNumber},'%') | and s.shop_number like concat('%', #{shopNumber},'%') | ||||
| </if> | </if> | ||||
| <if test=" null != floor "> | <if test=" null != floor "> | ||||
| and s.floor = #{floor} | |||||
| and s.floor_id = #{floor} | |||||
| </if> | </if> | ||||
| <if test=" null != building "> | <if test=" null != building "> | ||||
| and s.building = #{building} | |||||
| and s.building_id = #{building} | |||||
| </if> | </if> | ||||
| order by rc.id desc | order by rc.id desc | ||||