| @@ -145,6 +145,19 @@ public class WxBillRent extends BaseEntity { | |||||
| @Transient | @Transient | ||||
| @SortColumn(column = "allPeriod") | @SortColumn(column = "allPeriod") | ||||
| private Integer allPeriod; | private Integer allPeriod; | ||||
| @Transient | |||||
| @SortColumn(column = "shopNumber") | |||||
| private String shopNumber; | |||||
| @Transient | |||||
| private Integer depositStatus; | |||||
| public Integer getDepositStatus() { | |||||
| return depositStatus; | |||||
| } | |||||
| public void setDepositStatus(Integer depositStatus) { | |||||
| this.depositStatus = depositStatus; | |||||
| } | |||||
| public Integer getAllPeriod() { | public Integer getAllPeriod() { | ||||
| return allPeriod; | return allPeriod; | ||||
| @@ -216,7 +216,7 @@ public class WxCoupon extends BaseEntity { | |||||
| @Transient | @Transient | ||||
| private Integer pressCount; | private Integer pressCount; | ||||
| @Transient | @Transient | ||||
| private Integer changeRate; | |||||
| private String changeRate; | |||||
| @Transient | @Transient | ||||
| @SortColumn(column = "join_count") | @SortColumn(column = "join_count") | ||||
| private Integer pressJoinCount; | private Integer pressJoinCount; | ||||
| @@ -189,7 +189,16 @@ public class WxPropertyContract extends BaseEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "租赁单价", name = "rentPrice") | @io.swagger.annotations.ApiModelProperty(value = "租赁单价", name = "rentPrice") | ||||
| private Integer rentPrice; | private Integer rentPrice; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "租金单位1日2月3年", name = "priceUnit") | |||||
| private Integer priceUnit; | |||||
| public Integer getPriceUnit() { | |||||
| return priceUnit; | |||||
| } | |||||
| public void setPriceUnit(Integer priceUnit) { | |||||
| this.priceUnit = priceUnit; | |||||
| } | |||||
| public Integer getTotalPeriodMonth() { | public Integer getTotalPeriodMonth() { | ||||
| return totalPeriodMonth; | return totalPeriodMonth; | ||||
| } | } | ||||
| @@ -339,6 +339,17 @@ public class WxRentContract extends BaseEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "租赁单价", name = "rentPrice") | @io.swagger.annotations.ApiModelProperty(value = "租赁单价", name = "rentPrice") | ||||
| private Integer rentPrice; | private Integer rentPrice; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "租金单位1日2月3年", name = "priceUnit") | |||||
| private Integer priceUnit; | |||||
| public Integer getPriceUnit() { | |||||
| return priceUnit; | |||||
| } | |||||
| public void setPriceUnit(Integer priceUnit) { | |||||
| this.priceUnit = priceUnit; | |||||
| } | |||||
| public Integer getTotalPeriodMonth() { | public Integer getTotalPeriodMonth() { | ||||
| return totalPeriodMonth; | return totalPeriodMonth; | ||||
| } | } | ||||
| @@ -95,6 +95,9 @@ public class WxBillAll extends BaseEntity { | |||||
| @Transient | @Transient | ||||
| @SortColumn(column = "totalReceivePay") | @SortColumn(column = "totalReceivePay") | ||||
| private Integer totalReceivePay; | private Integer totalReceivePay; | ||||
| @Transient | |||||
| @SortColumn(column = "shopNumber") | |||||
| private String shopNumber; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "过滤已收金额1过滤", name = "filterHasPay") | @io.swagger.annotations.ApiModelProperty(value = "过滤已收金额1过滤", name = "filterHasPay") | ||||
| @@ -114,6 +114,7 @@ | |||||
| <if test=" null != rentContractId ">and br.`rent_contract_id` = #{rentContractId}</if> | <if test=" null != rentContractId ">and br.`rent_contract_id` = #{rentContractId}</if> | ||||
| <if test=" null != payWay ">and br.`pay_way` = #{payWay}</if> | <if test=" null != payWay ">and br.`pay_way` = #{payWay}</if> | ||||
| <if test=" null != latePayStatus ">and br.`late_pay_status` = #{latePayStatus}</if> | <if test=" null != latePayStatus ">and br.`late_pay_status` = #{latePayStatus}</if> | ||||
| <if test=" null != depositStatus ">and d.`status` = #{depositStatus}</if> | |||||
| </where> | </where> | ||||
| <if test=" null != sortColumns">order by ${sortColumns}</if> | <if test=" null != sortColumns">order by ${sortColumns}</if> | ||||
| @@ -41,7 +41,7 @@ | |||||
| <result column="total_period_month" property="totalPeriodMonth"/> | <result column="total_period_month" property="totalPeriodMonth"/> | ||||
| <result column="total_period_day" property="totalPeriodDay"/> | <result column="total_period_day" property="totalPeriodDay"/> | ||||
| <result column="rent_price" property="rentPrice"/> | <result column="rent_price" property="rentPrice"/> | ||||
| <result column="price_unit" property="priceUnit"/> | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| @@ -51,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`, `file_names`, | `start_date`,`end_date`,`apply_status`,`adjust_period`,`business_type`,adjust_ratio,`rent_info`, `file_names`, | ||||
| total_period_month,total_period_day,rent_price | |||||
| total_period_month,total_period_day,rent_price,price_unit | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -47,6 +47,7 @@ | |||||
| <result column="total_period_month" property="totalPeriodMonth"/> | <result column="total_period_month" property="totalPeriodMonth"/> | ||||
| <result column="total_period_day" property="totalPeriodDay"/> | <result column="total_period_day" property="totalPeriodDay"/> | ||||
| <result column="rent_price" property="rentPrice"/> | <result column="rent_price" property="rentPrice"/> | ||||
| <result column="price_unit" property="priceUnit"/> | |||||
| </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`,total_period_month,total_period_day,rent_price | |||||
| `business_type`,`rent_info`, `file_names`,total_period_month,total_period_day,rent_price,price_unit | |||||
| </sql> | </sql> | ||||