From 03da3f37fccf27659c0d8f7276570be26b6ed789 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 17 Dec 2018 11:01:56 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=93=81=E7=89=8C=E4=BF=A1=E6=81=AF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxPropertyContractMapper.xml | 4 ++-- .../src/main/resources/mapper/WxRentContractMapper.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index 89cc0d069..f711197a9 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -96,12 +96,12 @@ rentalEndDate,rc.`status`,rc.price,rc.contract_number contractNumber,s.shop_number shopNumber, f.floor_name floorName,b.building_name buildingName,receive_period receivePeriod, rc.lease,rc.filepath,rc.filename,rc.pay_account payAccount,rc.sign_date signDate, - start_date startDate,end_date endDate,rc.rent_contract_id rentContractId,b.`name` brandName + start_date startDate,end_date endDate,rc.rent_contract_id rentContractId,br.`name` brandName from wx_property_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 rc.tenant_id=#{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 96197f51e..65eee0676 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -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 rc.tenant_id=#{tenantId} and rc.`merchant_name` like concat('%',#{merchantName},'%')