|
|
@@ -42,10 +42,13 @@ |
|
|
) bill |
|
|
) bill |
|
|
left join wx_merchant m on bill.merchant_id=m.id |
|
|
left join wx_merchant m on bill.merchant_id=m.id |
|
|
left join wx_shop s on bill.shop_id=s.id |
|
|
left join wx_shop s on bill.shop_id=s.id |
|
|
where date_format(bill.receive_date,'%Y-%m')=#{month} |
|
|
|
|
|
|
|
|
where 1=1 |
|
|
<if test=" null != tenantId "> |
|
|
<if test=" null != tenantId "> |
|
|
and bill.tenant_id=#{tenantId} |
|
|
and bill.tenant_id=#{tenantId} |
|
|
</if> |
|
|
</if> |
|
|
|
|
|
<if test=" null != month and ''!=month"> |
|
|
|
|
|
and date_format(bill.receive_date,'%Y-%m')=#{month} |
|
|
|
|
|
</if> |
|
|
<if test=" null != merchantName and ''!=merchantName ">and m.`name` like concat('%',#{merchantName},'%')</if> |
|
|
<if test=" null != merchantName and ''!=merchantName ">and m.`name` like concat('%',#{merchantName},'%')</if> |
|
|
<if test=" null != billTypeValue ">and bill.bill_type_value = #{billTypeValue}</if> |
|
|
<if test=" null != billTypeValue ">and bill.bill_type_value = #{billTypeValue}</if> |
|
|
<if test=" null != status ">and bill.`status` = #{status}</if> |
|
|
<if test=" null != status ">and bill.`status` = #{status}</if> |
|
|
|