From eca8e4336f0004a60798ccfc125fd0b40c6ce7bf Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 4 Jun 2019 15:37:50 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=9F=E8=B5=81=E8=AE=B0=E7=A7=9F=E5=BC=80?= =?UTF-8?q?=E5=A7=8B=E6=97=A5=E6=9C=9F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V201906041530__L_ALTER_RENT.sql | 5 +++++ .../main/java/com/iformall/domain/po/WxPropertyContract.java | 1 - .../src/main/java/com/iformall/domain/po/WxRentContract.java | 1 - .../src/main/resources/mapper/WxPropertyContractMapper.xml | 3 ++- .../src/main/resources/mapper/WxRentContractMapper.xml | 3 ++- 5 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906041530__L_ALTER_RENT.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906041530__L_ALTER_RENT.sql b/mallinkAdmin/src/main/resources/db/migration/V201906041530__L_ALTER_RENT.sql new file mode 100644 index 000000000..fe3c60944 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906041530__L_ALTER_RENT.sql @@ -0,0 +1,5 @@ +alter table wx_rent_contract +add column `rent_start_type` int(1) DEFAULT 1 COMMENT '1按租赁日生产2按计租日生成账单'; + +alter table wx_property_contract +add column `rent_start_type` int(1) DEFAULT 1 COMMENT '1按租赁日生产2按计租日生成账单'; \ 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 ef522ab1d..858ef5d61 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -178,7 +178,6 @@ public class WxPropertyContract extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "1按租赁日生产2按计租日生成账单", name = "rentStartType") - @Transient private Integer rentStartType; public static enum Field 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 f75eaf79a..739ff60f1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -218,7 +218,6 @@ public class WxRentContract extends BaseEntity { private String subjectName; @io.swagger.annotations.ApiModelProperty(value = "1按租赁日生产2按计租日生成账单", name = "rentStartType") - @Transient private Integer rentStartType; // public Integer getAdjustPeriod() { diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index 8cfb72821..ea604c4c2 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -41,6 +41,7 @@ + @@ -50,7 +51,7 @@ `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,subject_name + `file_names`,price_unit,rent_price,subject_name,rent_start_type diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 1cf032510..089abc2d5 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -47,6 +47,7 @@ + @@ -57,7 +58,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,`subject_name` + `business_type`,`rent_info`, `file_names`,price_unit,rent_price,`subject_name`,rent_start_type