|
@@ -1940,6 +1940,9 @@
|
|
<if test="con != null">
|
|
<if test="con != null">
|
|
and (instr(r_consignee.CONSIGNEE_COMPANY_NAME, #{con}) > 0 or instr(a_s_order.SALE_NUMBER, #{con}) > 0)
|
|
and (instr(r_consignee.CONSIGNEE_COMPANY_NAME, #{con}) > 0 or instr(a_s_order.SALE_NUMBER, #{con}) > 0)
|
|
</if>
|
|
</if>
|
|
|
|
+ <if test="oneDate != null">
|
|
|
|
+ and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') <= a_s_order.UPDATE_TIME
|
|
|
|
+ </if>
|
|
<if test="startDate != null">
|
|
<if test="startDate != null">
|
|
and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') <= a_s_order.UPDATE_TIME
|
|
and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') <= a_s_order.UPDATE_TIME
|
|
and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= a_s_order.UPDATE_TIME
|
|
and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= a_s_order.UPDATE_TIME
|