|
|
|
@@ -21,13 +21,14 @@ |
|
|
|
<result column="updatetime" jdbcType="TIMESTAMP" property="updatetime" /> |
|
|
|
<result column="rent_shop_type" jdbcType="INTEGER" property="rentShopType"/> |
|
|
|
<result column="return_price" jdbcType="INTEGER" property="returnPrice"/> |
|
|
|
<result column="shop_info" jdbcType="VARCHAR" property="shopInfo"/> |
|
|
|
|
|
|
|
</resultMap> |
|
|
|
|
|
|
|
<sql id="allColumns"> |
|
|
|
`id`,`property_contract_id`,`receive_pay`,`pay`,`receive_date`, |
|
|
|
`pay_date`,`createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`, |
|
|
|
`merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`return_price` |
|
|
|
`merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`return_price`,`shop_info` |
|
|
|
</sql> |
|
|
|
|
|
|
|
<sql id="dynamicWhereConditions"> |
|
|
|
@@ -69,7 +70,8 @@ |
|
|
|
select br.`id`,br.`receive_pay` receivePay,br.`pay`,br.`receive_date` receiveDate, |
|
|
|
br.`pay_date` payDate,br.`createtime`,br.`expired_day` expiredDay,br.`owe`,br.`status`, |
|
|
|
br.`need_pay` needPay,m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`, |
|
|
|
br.`merchant_id` merchantId,br.`rent_shop_type` rentShopType,br.`return_price` returnPrice |
|
|
|
br.`merchant_id` merchantId,br.`rent_shop_type` rentShopType,br.`return_price` returnPrice,br.`shop_info` |
|
|
|
shopInfo |
|
|
|
from wx_bill_property_deposit br left join wx_merchant m on br.merchant_id=m.id |
|
|
|
left join wx_shop s on br.shop_id=s.id |
|
|
|
<where> |
|
|
|
|