|
|
@@ -33,13 +33,13 @@ |
|
|
<result column="freeze" property="freeze"/> |
|
|
<result column="freeze" property="freeze"/> |
|
|
<result column="build_way" property="buildWay"/> |
|
|
<result column="build_way" property="buildWay"/> |
|
|
<result column="service_charge_pay" property="serviceChargePay"/> |
|
|
<result column="service_charge_pay" property="serviceChargePay"/> |
|
|
<result column="bill_remark" jdbcType="VARCHAR" property="remark"/> |
|
|
|
|
|
|
|
|
<result column="remark" jdbcType="VARCHAR" property="remark"/> |
|
|
</resultMap> |
|
|
</resultMap> |
|
|
|
|
|
|
|
|
<sql id="allColumns"> |
|
|
<sql id="allColumns"> |
|
|
`id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`apply_status`,`apply_pay_img`,`apply_update_time`, |
|
|
`id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`apply_status`,`apply_pay_img`,`apply_update_time`, |
|
|
`tenant_id`,`parent_tenant_id`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`shop_name`,`updatetime`,`type`,`last_owe_call_time`, |
|
|
`tenant_id`,`parent_tenant_id`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`shop_name`,`updatetime`,`type`,`last_owe_call_time`, |
|
|
`rent_shop_type`,`pay_way`,`price_detail`,`starttime`,`endtime`,freeze,build_way,service_charge_pay,`bill_remark`,`last_owe_call_user` |
|
|
|
|
|
|
|
|
`rent_shop_type`,`pay_way`,`price_detail`,`starttime`,`endtime`,freeze,build_way,service_charge_pay,`remark`,`last_owe_call_user` |
|
|
</sql> |
|
|
</sql> |
|
|
|
|
|
|
|
|
<sql id="dynamicWhereConditions"> |
|
|
<sql id="dynamicWhereConditions"> |
|
|
@@ -143,7 +143,7 @@ |
|
|
select br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day` , |
|
|
select br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day` , |
|
|
br.`status`,br.`updatetime`,br.`merchant_id`,br.shop_id,br.`last_owe_call_time`,br.`last_owe_call_user`, |
|
|
br.`status`,br.`updatetime`,br.`merchant_id`,br.shop_id,br.`last_owe_call_time`,br.`last_owe_call_user`, |
|
|
br.shop_name,br.type,br.`rent_shop_type`,br.pay_way,br.price_detail,br.`starttime`,br.`endtime`,br.`build_way`, |
|
|
br.shop_name,br.type,br.`rent_shop_type`,br.pay_way,br.price_detail,br.`starttime`,br.`endtime`,br.`build_way`, |
|
|
br.freeze,br.service_charge_pay,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`bill_remark` |
|
|
|
|
|
|
|
|
br.freeze,br.service_charge_pay,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`remark` |
|
|
from wx_bill_daily br |
|
|
from wx_bill_daily br |
|
|
<include refid="queryBillDailyListConditions" /> |
|
|
<include refid="queryBillDailyListConditions" /> |
|
|
<if test=" null != sortColumns"> order by ${sortColumns} </if> |
|
|
<if test=" null != sortColumns"> order by ${sortColumns} </if> |
|
|
|