|
|
|
@@ -20,13 +20,14 @@ |
|
|
|
<result column="name" jdbcType="VARCHAR" property="name"/> |
|
|
|
<result column="comments" jdbcType="VARCHAR" property="comments"/> |
|
|
|
<result column="rent_shop_type" jdbcType="INTEGER" property="rentShopType"/> |
|
|
|
<result column="return_price" jdbcType="INTEGER" property="returnPrice"/> |
|
|
|
|
|
|
|
</resultMap> |
|
|
|
|
|
|
|
<sql id="allColumns"> |
|
|
|
`id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`, |
|
|
|
`tenant_id`,`owe`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,`name`,`comments`, |
|
|
|
`rent_shop_type` |
|
|
|
`rent_shop_type`,`return_price` |
|
|
|
</sql> |
|
|
|
|
|
|
|
<sql id="dynamicWhereConditions"> |
|
|
|
@@ -68,7 +69,7 @@ |
|
|
|
<select id="queryBillList" parameterType="com.iformall.domain.po.WxBillOtherDeposit" resultType="hashmap"> |
|
|
|
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`, |
|
|
|
m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`, |
|
|
|
m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`,br.`return_price` returnPrice |
|
|
|
br.`merchant_id` merchantId,br.shop_id shopId,br.name,br.comments,br.`rent_shop_type` rentShopType |
|
|
|
from wx_bill_other_deposit br left join wx_merchant m on br.merchant_id=m.id |
|
|
|
left join wx_shop s on br.shop_id=s.id |
|
|
|
|