From 5c885f57c9e97886cdd459c7c1c0938c5d603eed Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 30 May 2019 13:58:41 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=89=A9=E4=B8=9A=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/V201905301400___PROPERTY_CONTRACT.sql | 2 ++ .../java/com/iformall/domain/po/WxPropertyContract.java | 3 +++ .../src/main/resources/mapper/WxPropertyContractMapper.xml | 7 +++++-- 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905301400___PROPERTY_CONTRACT.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905301400___PROPERTY_CONTRACT.sql b/mallinkAdmin/src/main/resources/db/migration/V201905301400___PROPERTY_CONTRACT.sql new file mode 100644 index 000000000..140b7760b --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201905301400___PROPERTY_CONTRACT.sql @@ -0,0 +1,2 @@ +ALTER TABLE `wx_property_contract` +ADD COLUMN `subject_name` varchar(200) DEFAULT NULL COMMENT '主体名称'; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java index 03a2fd76a..6794002c7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -173,6 +173,9 @@ public class WxPropertyContract 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") diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index dcaebc3c0..8cfb72821 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -40,6 +40,7 @@ + @@ -48,7 +49,8 @@ `deposit`,`pay_date`,`is_del`,`merchant_name`,`brand`,`business_id`, `shop_type`,`shop_id`,`updatetime`,`createtime`,`rent_area`, `link_person`,`link_phone`,`pay_account`,`filename`,`lease`,`rent_contract_id`, - `start_date`,`end_date`,`apply_status`,`adjust_period`,`business_type`,adjust_ratio,`rent_info`, `file_names`,price_unit,rent_price + `start_date`,`end_date`,`apply_status`,`adjust_period`,`business_type`,adjust_ratio,`rent_info`, + `file_names`,price_unit,rent_price,subject_name @@ -108,7 +110,8 @@ 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,br.`name` brandName, s.addr,rc.apply_status applyStatus,rc.adjust_period adjustPeriod,rc.business_type businessType, - rc.adjust_ratio adjustRatio,rc.rent_info rentInfo, rc.file_names fileNames,rc.price_unit + rc.adjust_ratio adjustRatio,rc.rent_info rentInfo, rc.file_names fileNames,rc.price_unit,rc.subject_name + subjectName 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