| @@ -248,8 +248,7 @@ | |||||
| )s) and status in(0,1) and status!=7 and tenant_id=#{tenantId} and rent_shop_type=2 | )s) and status in(0,1) and status!=7 and tenant_id=#{tenantId} and rent_shop_type=2 | ||||
| </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,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 | ||||
| @@ -259,6 +258,16 @@ | |||||
| where ms.is_del=0) s | where ms.is_del=0) s | ||||
| inner join (select * from wx_rent_contract where status in(2,3,4)) rc on s.merchant_id=rc.merchant_id | inner join (select * from wx_rent_contract where status in(2,3,4)) rc on s.merchant_id=rc.merchant_id | ||||
| where rc.tenant_id=#{tenantId} | where rc.tenant_id=#{tenantId} | ||||
| <if test=" null != shopNumber and ''!=shopNumber"> | |||||
| and s.shop_number like concat('%', #{shopNumber},'%') | |||||
| </if> | |||||
| <if test=" null != floor "> | |||||
| and s.floor_name like concat('%', #{floor},'%') | |||||
| </if> | |||||
| <if test=" null != building "> | |||||
| and s.building_name like concat('%', #{building},'%') | |||||
| </if> | |||||
| order by rc.id desc | order by rc.id desc | ||||
| </select> | </select> | ||||