From dd0df40ad12157692a726f328d1f0e9fdf24a928 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 20 May 2019 11:23:41 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=88=E5=90=8C=E4=BC=98=E5=8C=96][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0][=E5=AE=8C=E5=96=84=E5=90=88=E5=90=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=9C=80=E6=B1=82]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V201905201108__L_ALTER_RENT.sql | 5 +++++ .../java/com/iformall/domain/po/WxPropertyContract.java | 3 +++ .../main/java/com/iformall/domain/po/WxRentContract.java | 9 --------- .../main/resources/mapper/WxPropertyContractMapper.xml | 6 ++++-- .../src/main/resources/mapper/WxRentContractMapper.xml | 7 ++++--- 5 files changed, 16 insertions(+), 14 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905201108__L_ALTER_RENT.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905201108__L_ALTER_RENT.sql b/mallinkAdmin/src/main/resources/db/migration/V201905201108__L_ALTER_RENT.sql new file mode 100644 index 000000000..160106eed --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201905201108__L_ALTER_RENT.sql @@ -0,0 +1,5 @@ +ALTER TABLE wx_property_contract + ADD COLUMN price_unit int(1) DEFAULT NULL COMMENT '租金单位1日2月3年'; + +ALTER TABLE wx_rent_contract + ADD COLUMN price_unit int(1) DEFAULT NULL COMMENT '租金单位1日2月3年'; \ No newline at end of file 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 5b3e00a7b..3b1cc2205 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -165,6 +165,9 @@ public class WxPropertyContract extends BaseEntity { @Transient private String floor; + @io.swagger.annotations.ApiModelProperty(value = "租金单位1日2月3年", name = "priceUnit") + private Integer priceUnit; + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") 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 15c0e115f..845545851 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -210,15 +210,6 @@ public class WxRentContract extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "上传文件名", name = "fileNames") private String fileNames; - @io.swagger.annotations.ApiModelProperty(value = "总租期(月)", name = "totalPeriodMonth") - private Integer totalPeriodMonth; - - @io.swagger.annotations.ApiModelProperty(value = "总租期(天)", name = "totalPeriodDay") - private Integer totalPeriodDay; - - @io.swagger.annotations.ApiModelProperty(value = "租赁单价", name = "rentPrice") - private Integer rentPrice; - @io.swagger.annotations.ApiModelProperty(value = "租金单位1日2月3年", name = "priceUnit") private Integer priceUnit; diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index 771bd2c4b..742093286 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -38,6 +38,8 @@ + + @@ -46,7 +48,7 @@ `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` + `start_date`,`end_date`,`apply_status`,`adjust_period`,`business_type`,adjust_ratio,`rent_info`, `file_names`,price_unit @@ -106,7 +108,7 @@ 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.adjust_ratio adjustRatio,rc.rent_info rentInfo, rc.file_names fileNames,rc.price_unit 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 diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index f8c5ab84f..130b4209b 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -44,6 +44,8 @@ + + @@ -53,8 +55,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` - + `business_type`,`rent_info`, `file_names`,price_unit @@ -113,7 +114,7 @@ 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.business_type businessType,rc.adjust_period adjustPeriod,rc.rent_info rentInfo, rc.file_names fileNames,rc.price_unit 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