diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml index e0f4c1c0..4eca4427 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml @@ -29,11 +29,13 @@ - AND c.paid_amount ]]> c.invoice_amount + AND (c.paid_amount ]]> c.invoice_amount or + (c.paid_amount is not null and c.paid_amount !=0 and c.invoice_amount is null)) - AND c.paid_amount c.invoice_amount + AND (c.paid_amount c.invoice_amount or + (c.paid_amount is null and c.invoice_amount is not null and c.invoice_amount !=0)) UNION ALL @@ -59,11 +61,13 @@ - AND gsub.paid_amount ]]> gsub.invoice_amount + AND (gsub.paid_amount ]]> gsub.invoice_amount or + (gsub.paid_amount is not null and gsub.paid_amount !=0 and gsub.invoice_amount is null)) - AND gsub.paid_amount gsub.invoice_amount + AND (gsub.paid_amount gsub.invoice_amount or + (gsub.paid_amount is null and gsub.invoice_amount is not null and gsub.invoice_amount !=0)) UNION ALL @@ -89,11 +93,13 @@ - AND sit.paid_amount ]]> sit.invoice_amount + AND (sit.paid_amount ]]> sit.invoice_amount or + (sit.paid_amount is not null and sit.paid_amount !=0 and sit.invoice_amount is null)) - AND sit.paid_amount sit.invoice_amount + AND (sit.paid_amount sit.invoice_amount or + (sit.paid_amount is null and sit.invoice_amount is not null and sit.invoice_amount !=0)) UNION ALL @@ -119,11 +125,13 @@ - AND msub.paid_amount ]]> msub.invoice_amount + AND (msub.paid_amount ]]> msub.invoice_amount or + (msub.paid_amount is not null and msub.paid_amount !=0 and msub.invoice_amount is null)) - AND msub.paid_amount msub.invoice_amount + AND (msub.paid_amount msub.invoice_amount or + (msub.paid_amount is null and msub.invoice_amount is not null and msub.invoice_amount !=0)) UNION ALL @@ -149,11 +157,13 @@ - AND tmsub.paid_amount ]]> tmsub.invoice_amount + AND (tmsub.paid_amount ]]> tmsub.invoice_amount or + (tmsub.paid_amount is not null and tmsub.paid_amount !=0 and tmsub.invoice_amount is null)) - AND tmsub.paid_amount tmsub.invoice_amount + AND (tmsub.paid_amount tmsub.invoice_amount or + (tmsub.paid_amount is null and tmsub.invoice_amount is not null and tmsub.invoice_amount !=0)) UNION ALL @@ -179,11 +189,13 @@ - AND tcp.paid_amount ]]> tcp.invoice_amount + AND (tcp.paid_amount ]]> tcp.invoice_amount or + (tcp.paid_amount is not null and tcp.paid_amount !=0 and tcp.invoice_amount is null)) - AND tcp.paid_amount tcp.invoice_amount + AND (tcp.paid_amount tcp.invoice_amount or + (tcp.paid_amount is null and tcp.invoice_amount is not null and tcp.invoice_amount !=0)) )p LEFT JOIN pay_payment_record ppr ON ppr.project_id = p.id @@ -223,11 +235,13 @@ - AND c.paid_amount ]]> c.invoice_amount + AND (c.paid_amount ]]> c.invoice_amount or + (c.paid_amount is not null and c.paid_amount !=0 and c.invoice_amount is null)) - AND c.paid_amount c.invoice_amount + AND (c.paid_amount c.invoice_amount or + (c.paid_amount is null and c.invoice_amount is not null and c.invoice_amount !=0)) UNION ALL @@ -252,11 +266,13 @@ - AND gsub.paid_amount ]]> gsub.invoice_amount + AND (gsub.paid_amount ]]> gsub.invoice_amount or + (gsub.paid_amount is not null and gsub.paid_amount !=0 and gsub.invoice_amount is null)) - AND gsub.paid_amount gsub.invoice_amount + AND (gsub.paid_amount gsub.invoice_amount or + (gsub.paid_amount is null and gsub.invoice_amount is not null and gsub.invoice_amount !=0)) UNION ALL @@ -281,11 +297,13 @@ - AND sit.paid_amount ]]> sit.invoice_amount + AND (sit.paid_amount ]]> sit.invoice_amount or + (sit.paid_amount is not null and sit.paid_amount !=0 and sit.invoice_amount is null)) - AND sit.paid_amount sit.invoice_amount + AND (sit.paid_amount sit.invoice_amount or + (sit.paid_amount is null and sit.invoice_amount is not null and sit.invoice_amount !=0)) UNION ALL @@ -310,11 +328,13 @@ - AND msub.paid_amount ]]> msub.invoice_amount + AND (msub.paid_amount ]]> msub.invoice_amount or + (msub.paid_amount is not null and msub.paid_amount !=0 and msub.invoice_amount is null)) - AND msub.paid_amount msub.invoice_amount + AND (msub.paid_amount msub.invoice_amount or + (msub.paid_amount is null and msub.invoice_amount is not null and msub.invoice_amount !=0)) UNION ALL @@ -339,11 +359,13 @@ - AND tmsub.paid_amount ]]> tmsub.invoice_amount + AND (tmsub.paid_amount ]]> tmsub.invoice_amount or + (tmsub.paid_amount is not null and tmsub.paid_amount !=0 and tmsub.invoice_amount is null)) - AND tmsub.paid_amount tmsub.invoice_amount + AND (tmsub.paid_amount tmsub.invoice_amount or + (tmsub.paid_amount is null and tmsub.invoice_amount is not null and tmsub.invoice_amount !=0)) UNION ALL @@ -368,11 +390,13 @@ - AND tcp.paid_amount ]]> tcp.invoice_amount + AND (tcp.paid_amount ]]> tcp.invoice_amount or + (tcp.paid_amount is not null and tcp.paid_amount !=0 and tcp.invoice_amount is null)) - AND tcp.paid_amount tcp.invoice_amount + AND (tcp.paid_amount tcp.invoice_amount or + (tcp.paid_amount is null and tcp.invoice_amount is not null and tcp.invoice_amount !=0)) )p LEFT JOIN pay_payment_record ppr ON ppr.project_id = p.id