From 6dbfe07e77e5b334874cce6df78b2f9130cd888f Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 29 May 2019 17:49:54 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=9F=E8=B5=81=E5=90=88=E5=90=8C][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=B7=BB=E5=8A=A0=E4=B8=BB=E4=BD=93?= =?UTF-8?q?=E5=90=8D=E7=A7=B0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V201905291742___RENT_CONTRACT.sql | 2 ++ .../main/java/com/iformall/domain/po/WxRentContract.java | 3 +++ .../src/main/resources/mapper/WxRentContractMapper.xml | 6 ++++-- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905291742___RENT_CONTRACT.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905291742___RENT_CONTRACT.sql b/mallinkAdmin/src/main/resources/db/migration/V201905291742___RENT_CONTRACT.sql new file mode 100644 index 000000000..beb5e85a4 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201905291742___RENT_CONTRACT.sql @@ -0,0 +1,2 @@ +ALTER TABLE `wx_rent_contract` +ADD COLUMN `subject_name` varchar(200) DEFAULT NULL COMMENT '主体名称'; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index de5274366..ed46ee1b3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -214,6 +214,9 @@ public class WxRentContract extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "多径租赁单价(其他放rentInfo)", name = "priceUnit") private String rentPrice; + @io.swagger.annotations.ApiModelProperty(value = "主体名称", name = "subjectName") + private String subjectName; + public static enum Field { Id_ASC("`id` ASC"), Id_DESC("`id` DESC") , MerchantId_ASC("`merchant_id` ASC"), MerchantId_DESC("`merchant_id` DESC") diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 43768aba7..1cf032510 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -46,6 +46,7 @@ + @@ -56,7 +57,7 @@ `pay_account`,`filename`,`lease`,`type`,`revenue`,`adjust_ratio`,`adjust_period`,`pay_ratio`, `start_date`,`end_date`, `apply_status`,`bank_name`,`rent_shop_type`,`fix_start_date`,`fix_end_date`, - `business_type`,`rent_info`, `file_names`,price_unit,rent_price + `business_type`,`rent_info`, `file_names`,price_unit,rent_price,`subject_name` @@ -115,7 +116,8 @@ 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,br.`name` brandName,rc.apply_status applyStatus,rc.bank_name bankName,rc.rent_shop_type rentShopType,rc.fix_start_date fixStartDate,rc.fix_end_date fixEndDate - ,rc.business_type businessType,rc.adjust_period adjustPeriod,rc.rent_info rentInfo, rc.file_names fileNames,rc.price_unit + ,rc.business_type businessType,rc.adjust_period adjustPeriod,rc.rent_info rentInfo, rc.file_names + fileNames,rc.price_unit,rc.subject_name subjectName 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