|
|
|
@@ -134,16 +134,11 @@ |
|
|
|
<if test=" null != month and '' != month"> |
|
|
|
and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} |
|
|
|
</if> |
|
|
|
<if test=" null == nearBillBeforeDays and null != oweBillBeforeDays"> |
|
|
|
and (br.`starttime` >= DATE_SUB(NOW(),INTERVAL #{oweBillBeforeDays} DAY) |
|
|
|
and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6) |
|
|
|
) |
|
|
|
<if test=" null == nearBillLastTime and null != oweBillLastTime"> |
|
|
|
and (br.`starttime` <= #{oweBillLastTime} and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6)) |
|
|
|
</if> |
|
|
|
<if test=" null != nearBillBeforeDays and null != oweBillBeforeDays"> |
|
|
|
and (br.`starttime` >= DATE_SUB(NOW(),INTERVAL #{nearBillBeforeDays} DAY) |
|
|
|
and br.`starttime` < DATE_SUB(NOW(),INTERVAL #{oweBillBeforeDays} DAY) |
|
|
|
and br.status not in (3,6) |
|
|
|
) |
|
|
|
<if test=" null != nearBillLastTime and null != oweBillLastTime"> |
|
|
|
and (br.`starttime` > #{oweBillLastTime} and br.`starttime` <= #{nearBillLastTime} and br.status not in (3,6)) |
|
|
|
</if> |
|
|
|
<if test=" null != rentShopType ">and br.`rent_shop_type` = #{rentShopType}</if> |
|
|
|
<if test=" null != propertyContractId ">and br.`property_contract_id` = #{propertyContractId}</if> |
|
|
|
|