|
@@ -25,19 +25,19 @@
|
|
|
d.customs_declaration_no,
|
|
|
d.sales_order_no,
|
|
|
d.proforma_invoice_no,
|
|
|
- SUM(d.tax_refund_amount) AS tax_refund_amount ,
|
|
|
+ SUM(d.tax_refund_amount) AS tax_refund_amount,
|
|
|
d.export_date,
|
|
|
SUM(d.export_quantity) AS export_quantity,
|
|
|
d.status
|
|
|
FROM tax_rebate_export_details d
|
|
|
WHERE d.deleted = 0 AND (d.agency_cert_no IS NULL OR d.agency_cert_no = '')
|
|
|
- <if test="customerUserId!= null and customerUserId!= ''">
|
|
|
+ <if test="customerUserId!= null ">
|
|
|
AND d.customer_user_id = #{customerUserId}
|
|
|
</if>
|
|
|
- <if test="declarationMonthYearStart != null">
|
|
|
+ <if test="declarationMonthYearStart != null and declarationMonthYearStart != ''">
|
|
|
AND d.declaration_month_year <![CDATA[ >= ]]> #{declarationMonthYearStart}
|
|
|
</if>
|
|
|
- <if test="declarationMonthYearEnd != null">
|
|
|
+ <if test="declarationMonthYearEnd != null and declarationMonthYearEnd != ''">
|
|
|
AND d.declaration_month_year <![CDATA[ <= ]]> #{declarationMonthYearEnd}
|
|
|
</if>
|
|
|
<if test="declarationBatch != null and declarationBatch != ''">
|