|
|
|
@@ -58,12 +58,25 @@ |
|
|
|
and `vendor_type` = #{vendorType} |
|
|
|
</if> |
|
|
|
|
|
|
|
<if test=" null != startDate"> |
|
|
|
and fee_time >= #{startDate} |
|
|
|
</if> |
|
|
|
<if test=" null != endDate"> |
|
|
|
and fee_time <= #{endDate} |
|
|
|
</if> |
|
|
|
<choose> |
|
|
|
<when test="1==isPay"> |
|
|
|
<if test=" null != startDate"> |
|
|
|
and fee_time >= #{startDate} |
|
|
|
</if> |
|
|
|
<if test=" null != endDate"> |
|
|
|
and fee_time <= #{endDate} |
|
|
|
</if> |
|
|
|
</when> |
|
|
|
<otherwise> |
|
|
|
<if test=" null != startDate"> |
|
|
|
and create_date >= #{startDate} |
|
|
|
</if> |
|
|
|
<if test=" null != endDate"> |
|
|
|
and create_date <= #{endDate} |
|
|
|
</if> |
|
|
|
</otherwise> |
|
|
|
</choose> |
|
|
|
|
|
|
|
<if test=" 1 == isPay"> |
|
|
|
and fee is not null |
|
|
|
and fee != '' |
|
|
|
|