|
@@ -107,7 +107,7 @@
|
|
AND fine.created BETWEEN #{dto.startPunishDate} AND #{dto.endPunishDate}
|
|
AND fine.created BETWEEN #{dto.startPunishDate} AND #{dto.endPunishDate}
|
|
</if>
|
|
</if>
|
|
<if test="dto != null and dto.startRefundDate != null and dto.startRefundDate!= null">
|
|
<if test="dto != null and dto.startRefundDate != null and dto.startRefundDate!= null">
|
|
- AND refund.refund_date BETWEEN #{dto.startRefundDate} AND #{dto.startRefundDate}
|
|
|
|
|
|
+ AND refund.refund_date BETWEEN #{dto.startRefundDate} AND #{dto.endRefundDate}
|
|
</if>
|
|
</if>
|
|
<if test="dto != null and dto.clientManagerId != null">
|
|
<if test="dto != null and dto.clientManagerId != null">
|
|
AND `order`.client_manager_id = #{dto.clientManagerId}
|
|
AND `order`.client_manager_id = #{dto.clientManagerId}
|