|
|
|
@@ -99,12 +99,12 @@ |
|
|
|
select rc.id,rc.merchant_name merchantName,rc.rental_start_date rentalStartDate,rc.rental_end_date rentalEndDate,rc.`status`, |
|
|
|
rc.price,rc.contract_number contractNumber,s.shop_number shopNumber,f.floor_name floorName,b.building_name buildingName, |
|
|
|
rc.lease,rc.filepath,rc.filename,rc.pay_account payAccount,rc.sign_date signDate,rc.merchant_id merchantId,rc.type, |
|
|
|
rc.start_date startDate,rc.end_date endDate,b.`name` brandName |
|
|
|
rc.start_date startDate,rc.end_date endDate,br.`name` brandName |
|
|
|
from wx_rent_contract rc |
|
|
|
left join wx_shop s on rc.shop_id=s.id |
|
|
|
left join wx_mall_floor f on s.floor=f.id |
|
|
|
left join wx_mall_building b on s.building=b.id |
|
|
|
left join wx_brand b on rc.brand=b.id |
|
|
|
left join wx_brand br on rc.brand=br.id |
|
|
|
<where> |
|
|
|
rc.tenant_id=#{tenantId} |
|
|
|
<if test=" null != merchantName and merchantName!=''">and rc.`merchant_name` like concat('%',#{merchantName},'%')</if> |
|
|
|
|