| @@ -196,14 +196,16 @@ | |||||
| <select id="getRentContractList" parameterType="com.iformall.domain.po.WxRentContract" | <select id="getRentContractList" parameterType="com.iformall.domain.po.WxRentContract" | ||||
| resultType="com.iformall.domain.po.WxRentContract"> | resultType="com.iformall.domain.po.WxRentContract"> | ||||
| select rc.*,s.shop_number,b.building_name building, f.floor_name floor,s.build_area buildArea from | |||||
| wx_rent_contract rc | |||||
| left join wx_shop s on rc.shop_id=s.id | |||||
| select s.shop_number,s.building_name building, s.floor_name floor,s.build_area,rc.* from ( | |||||
| select ms.merchant_id,s.shop_number,b.building_name,f.floor_name,s.build_area | |||||
| 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 | ||||
| left join wx_mall_floor f on s.floor=f.id | |||||
| where rc.status not in(0,1,5,6,7) and rc.tenant_id=#{tenantId} | |||||
| <if test=" null != rentShopType ">and rc.rent_shop_type = #{rentShopType}</if> | |||||
| order by id desc | |||||
| left join wx_mall_floor f on s.floor=f.id | |||||
| left join wx_merchant_shop ms on s.id=ms.shop_id | |||||
| where s.tenant_id=#{tenant_id} and ms.is_del=0) s | |||||
| inner join (select * from wx_rent_contract where status not in(0,1,5,6,7)) rc on s.merchant_id=rc.merchant_id | |||||
| where rc.tenant_id=#{tenant_id} | |||||
| order by rc.id desc | |||||
| </select> | </select> | ||||
| <select id="updateStatusForUnsign" parameterType="com.iformall.domain.po.WxRentContract"> | <select id="updateStatusForUnsign" parameterType="com.iformall.domain.po.WxRentContract"> | ||||