|
|
@@ -99,7 +99,7 @@ |
|
|
<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> |
|
|
<if test=" null != rentShopType ">and bill.rent_shop_type = #{rentShopType}</if> |
|
|
<if test=" null != rentShopType ">and bill.rent_shop_type = #{rentShopType}</if> |
|
|
<if test=" null != starttime and null!= endtime "> |
|
|
|
|
|
|
|
|
<if test=" null != starttime and null!= endtime and '' != starttime and ''!= endtime "> |
|
|
and bill.receive_date between #{starttime} and #{endtime} |
|
|
and bill.receive_date between #{starttime} and #{endtime} |
|
|
</if> |
|
|
</if> |
|
|
<if test=" null != merchantId and ''!=merchantId"> |
|
|
<if test=" null != merchantId and ''!=merchantId"> |
|
|
@@ -111,6 +111,14 @@ |
|
|
#{status} |
|
|
#{status} |
|
|
</foreach> |
|
|
</foreach> |
|
|
</if> |
|
|
</if> |
|
|
|
|
|
|
|
|
|
|
|
<if test=" null != typeList "> |
|
|
|
|
|
and bill.`bill_type_value` in |
|
|
|
|
|
<foreach collection="typeList" index="index" item="type" open="(" separator="," close=")"> |
|
|
|
|
|
#{type} |
|
|
|
|
|
</foreach> |
|
|
|
|
|
</if> |
|
|
|
|
|
|
|
|
<if test=" null != sortColumns"> order by ${sortColumns} </if> |
|
|
<if test=" null != sortColumns"> order by ${sortColumns} </if> |
|
|
<if test=" null == sortColumns"> order by bill.receive_date,bill.id desc,bill.merchant_id,bill.status</if> |
|
|
<if test=" null == sortColumns"> order by bill.receive_date,bill.id desc,bill.merchant_id,bill.status</if> |
|
|
|
|
|
|
|
|
@@ -291,7 +299,7 @@ |
|
|
#{type} |
|
|
#{type} |
|
|
</foreach> |
|
|
</foreach> |
|
|
</if> |
|
|
</if> |
|
|
<if test="null!=starttime and null!=endtime"> |
|
|
|
|
|
|
|
|
<if test="null!=starttime and null!=endtime and ''!=starttime and ''!=endtime "> |
|
|
and DATE_FORMAT(bill.receive_date,'%Y-%m') between #{starttime} and #{endtime} |
|
|
and DATE_FORMAT(bill.receive_date,'%Y-%m') between #{starttime} and #{endtime} |
|
|
</if> |
|
|
</if> |
|
|
<if test=" null != status "> |
|
|
<if test=" null != status "> |
|
|
|