| @@ -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按计租日生成账单'; | |||||
| @@ -178,7 +178,6 @@ public class WxPropertyContract extends BaseEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "1按租赁日生产2按计租日生成账单", name = "rentStartType") | @io.swagger.annotations.ApiModelProperty(value = "1按租赁日生产2按计租日生成账单", name = "rentStartType") | ||||
| @Transient | |||||
| private Integer rentStartType; | private Integer rentStartType; | ||||
| public static enum Field | public static enum Field | ||||
| @@ -218,7 +218,6 @@ public class WxRentContract extends BaseEntity { | |||||
| private String subjectName; | private String subjectName; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "1按租赁日生产2按计租日生成账单", name = "rentStartType") | @io.swagger.annotations.ApiModelProperty(value = "1按租赁日生产2按计租日生成账单", name = "rentStartType") | ||||
| @Transient | |||||
| private Integer rentStartType; | private Integer rentStartType; | ||||
| // public Integer getAdjustPeriod() { | // public Integer getAdjustPeriod() { | ||||
| @@ -41,6 +41,7 @@ | |||||
| <result column="price_unit" property="priceUnit"/> | <result column="price_unit" property="priceUnit"/> | ||||
| <result column="rent_price" property="rentPrice"/> | <result column="rent_price" property="rentPrice"/> | ||||
| <result column="subject_name" property="subjectName"/> | <result column="subject_name" property="subjectName"/> | ||||
| <result column="rent_start_type" property="rentStartType"/> | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| @@ -50,7 +51,7 @@ | |||||
| `shop_type`,`shop_id`,`updatetime`,`createtime`,`rent_area`, | `shop_type`,`shop_id`,`updatetime`,`createtime`,`rent_area`, | ||||
| `link_person`,`link_phone`,`pay_account`,`filename`,`lease`,`rent_contract_id`, | `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`, | `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 | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -47,6 +47,7 @@ | |||||
| <result column="price_unit" property="priceUnit"/> | <result column="price_unit" property="priceUnit"/> | ||||
| <result column="rent_price" property="rentPrice"/> | <result column="rent_price" property="rentPrice"/> | ||||
| <result column="subject_name" property="subjectName"/> | <result column="subject_name" property="subjectName"/> | ||||
| <result column="rent_start_type" property="rentStartType"/> | |||||
| </resultMap> | </resultMap> | ||||
| @@ -57,7 +58,7 @@ | |||||
| `pay_account`,`filename`,`lease`,`type`,`revenue`,`adjust_ratio`,`adjust_period`,`pay_ratio`, | `pay_account`,`filename`,`lease`,`type`,`revenue`,`adjust_ratio`,`adjust_period`,`pay_ratio`, | ||||
| `start_date`,`end_date`, | `start_date`,`end_date`, | ||||
| `apply_status`,`bank_name`,`rent_shop_type`,`fix_start_date`,`fix_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 | |||||
| </sql> | </sql> | ||||