|
|
|
@@ -26,16 +26,16 @@ |
|
|
|
where 1=1 |
|
|
|
<if test=" null != id ">and s.`id` = #{id}</if> |
|
|
|
<if test=" null != tenantId ">and s.`tenant_id` = #{tenantId}</if> |
|
|
|
<if test=" null != merchantName ">and m.name like concat('%', #{merchantName},'%')</if> |
|
|
|
<if test="startTime != null"> |
|
|
|
<if test=" null != merchantName and merchantName !='' ">and m.name like concat('%', #{merchantName},'%')</if> |
|
|
|
<if test="startTime != null and startTime !=''"> |
|
|
|
and createtime >= #{startTime} |
|
|
|
</if> |
|
|
|
<if test="endTime != null"> |
|
|
|
<if test="endTime != null and endTime !=''"> |
|
|
|
and createtime <= #{endTime} |
|
|
|
</if> |
|
|
|
<if test=" null != settleNumber ">and s.`settle_number` = #{settleNumber}</if> |
|
|
|
<if test=" null != status ">and s.`status` = #{status}</if> |
|
|
|
<if test=" null != applyStatus ">and s.`apply_status` = #{applyStatus}</if> |
|
|
|
<if test=" null != settleNumber and settleNumber !='' ">and s.`settle_number` = #{settleNumber}</if> |
|
|
|
<if test=" null != status and status !=''">and s.`status` = #{status}</if> |
|
|
|
<if test=" null != applyStatus and applyStatus !=''">and s.`apply_status` = #{applyStatus}</if> |
|
|
|
|
|
|
|
<if test=" null != sortColumns">order by ${sortColumns}</if> |
|
|
|
</sql> |
|
|
|
|