|
|
|
@@ -53,7 +53,12 @@ |
|
|
|
select id,merchant_id,shop_id,tenant_id,7 bill_type_value,'其他' bill_type,'' need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status from wx_bill_other |
|
|
|
) bill |
|
|
|
where bill.tenant_id=#{tenantId} and bill.status=#{status} |
|
|
|
and bill.receive_date between #{starttime} and #{endtime} |
|
|
|
<if test=" null != starttime and null!= endtime "> |
|
|
|
and bill.receive_date between #{starttime} and #{endtime} |
|
|
|
</if> |
|
|
|
<if test=" null != month "> |
|
|
|
and date_format(bill.receive_date,'%Y-%m')=#{month} |
|
|
|
</if> |
|
|
|
|
|
|
|
</select> |
|
|
|
|
|
|
|
@@ -75,8 +80,13 @@ |
|
|
|
select id,merchant_id,shop_id,tenant_id,7 bill_type_value,'其他' bill_type,'' need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status from wx_bill_other |
|
|
|
) bill |
|
|
|
where bill.tenant_id=#{tenantId} and bill.status=#{status} |
|
|
|
and bill.receive_date between #{starttime} and #{endtime} |
|
|
|
|
|
|
|
<if test=" null != starttime and null!= endtime "> |
|
|
|
and bill.receive_date between #{starttime} and #{endtime} |
|
|
|
</if> |
|
|
|
<if test=" null != month "> |
|
|
|
and date_format(bill.receive_date,'%Y-%m')=#{month} |
|
|
|
</if> |
|
|
|
|
|
|
|
</select> |
|
|
|
|
|
|
|
|
|
|
|
|