| @@ -57,7 +57,6 @@ | |||||
| <if test=" null != month and ''!=month"> | <if test=" null != month and ''!=month"> | ||||
| and date_format(bill.receive_date,'%Y-%m')=#{month} | and date_format(bill.receive_date,'%Y-%m')=#{month} | ||||
| </if> | </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 and '' != starttime and ''!= endtime "> | <if test=" null != starttime and null!= endtime and '' != starttime and ''!= endtime "> | ||||
| @@ -73,12 +72,6 @@ | |||||
| </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 != freeze ">and bill.freeze = #{freeze}</if> | <if test=" null != freeze ">and bill.freeze = #{freeze}</if> | ||||
| <if test=" null != id ">and bill.id = #{id}</if> | <if test=" null != id ">and bill.id = #{id}</if> | ||||
| @@ -302,9 +295,6 @@ | |||||
| <if test=" null != status "> | <if test=" null != status "> | ||||
| and bill.status=#{status} | and bill.status=#{status} | ||||
| </if> | </if> | ||||
| <if test=" null != billTypeValue "> | |||||
| and bill.bill_type_value=#{billTypeValue} | |||||
| </if> | |||||
| <if test=" null != rentShopType "> | <if test=" null != rentShopType "> | ||||
| and bill.rent_shop_type = #{rentShopType} | and bill.rent_shop_type = #{rentShopType} | ||||
| </if> | </if> | ||||