|
|
|
@@ -131,6 +131,9 @@ |
|
|
|
<result column="revenue_rent_price" jdbcType="VARCHAR" property="revenueRentPrice"/> |
|
|
|
<result column="revenue_jumps_remark" jdbcType="VARCHAR" property="revenueJumpsRemark"/> |
|
|
|
<result column="free_period_remark" jdbcType="VARCHAR" property="freePeriodRemark"/> |
|
|
|
|
|
|
|
<result column="first_bill_date_start" jdbcType="TIMESTAMP" property="firstBillDateStart"/> |
|
|
|
<result column="first_bill_date_end" jdbcType="TIMESTAMP" property="firstBillDateEnd"/> |
|
|
|
</resultMap> |
|
|
|
|
|
|
|
<sql id="allColumns"> |
|
|
|
@@ -138,7 +141,7 @@ |
|
|
|
`shop_type_sub`,`lease_purpose`,`contractual_rules`,`delivery_date`,`delivery_grace_period`,`opening_date`,`business_hours`,`scope_metre`, |
|
|
|
`decimal_size`,`price`,`rental_start_date`,`rental_end_date`,`sign_date`,`receive_period`,`receive_period_unit`, |
|
|
|
`tenant_id`,`parent_tenant_id`,`filepath`,`status`,`contract_number`,`price_detail`,`create_by`,`update_by`, |
|
|
|
`first_party_bank_info`,`second_party_bank_info`,`second_party_tax_info`,`day_price_calcute`, |
|
|
|
`first_party_bank_info`,`second_party_bank_info`,`second_party_tax_info`,`day_price_calcute`,`first_bill_date_start`,`first_bill_date_end`, |
|
|
|
`property_name`,`property_fee`,`fee_cycle`,`water_fee`,`electricity_fees`,`month_average_days`,`free_period_remark`, |
|
|
|
`deposit`,cashtype_content_lsit,cashtype_lsit,`pay_date`,`is_del`,`merchant_name`,`revenue_jumps_remark`, |
|
|
|
`brand`,`business_id`,`shop_type`,`shop_type_str`,`updatetime`,`createtime`,`link_person`,`link_phone`,`link_address`, |
|
|
|
@@ -382,6 +385,8 @@ |
|
|
|
<result column="revenue_rent_price" jdbcType="VARCHAR" property="revenueRentPrice"/> |
|
|
|
<result column="revenue_jumps_remark" jdbcType="VARCHAR" property="revenueJumpsRemark"/> |
|
|
|
<result column="free_period_remark" jdbcType="VARCHAR" property="freePeriodRemark"/> |
|
|
|
<result column="first_bill_date_start" jdbcType="TIMESTAMP" property="firstBillDateStart"/> |
|
|
|
<result column="first_bill_date_end" jdbcType="TIMESTAMP" property="firstBillDateEnd"/> |
|
|
|
</resultMap> |
|
|
|
|
|
|
|
|
|
|
|
@@ -390,7 +395,7 @@ |
|
|
|
rc.price as rent_price,rc.contract_number,rc.shop_name,rc.type,rc.apply_status,rc.price_detail,rc.revenue_fixed_rent_price,rc.revenue_rent_price, |
|
|
|
rc.rent_shop_type,rc.rent_info,pc.price as property_price,rc.merchant_id,pc.`status` as property_status, |
|
|
|
rc.price_unit as rent_price_unit,pc.price_unit as property_price_unit,rc.day_price_calcute,rc.free_period_remark, |
|
|
|
rc.business_type businessType,rc.month_average_days,rc.revenue_jumps_remark |
|
|
|
rc.business_type businessType,rc.month_average_days,rc.revenue_jumps_remark,rc.first_bill_date_start,rc.first_bill_date_end |
|
|
|
from wx_rent_contract rc left join wx_property_contract pc on rc.id=pc.rent_contract_id |
|
|
|
<where> |
|
|
|
<if test=" null != tenantId and '' != tenantId"> |
|
|
|
|