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 f7a80029..85e55ab5 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 @@ -550,6 +550,35 @@ AND tcp.affirm_income = #{payCommonProject.affirmIncome} + + UNION ALL + select ppc.id,ppc.company_temporary_name AS charge_project,22 AS charge_use,ppc.pack_principal_id as principal_id,su.realname AS principal_name,ppc.company_id as charge_company_id,ppc.company_temporary_name as charge_company_temporary_name,ppc.receivable_amount,ppc.paid_amount, + ppc.need_invoice,NULL AS pack,ppc.in_account,ppc.make_invoice,NULL AS mail,ppc.create_time,8 AS projectType,ppc.invoice_amount,ppc.mail_contacts_id,'' AS register_check_result,ppc.pack_contact_temporary_name as contacts_temporary_name,NULL AS payment_status,ppc.company_temporary_id,ppc.confirm_amount,ppc.income_affirm AS affirm_income + from pay_pack_company ppc + left join sys_user su on ppc.pack_principal_id = su.id + left join pay_company_management on ppc.company_id = pay_company_management.id + where + ppc.receivable_amount ]]> 0 + and ppc.receivable_amount is not null + + AND ppc.pack_principal_id = #{payCommonProject.principalId} + + + AND ppc.company_temporary_name like concat('%',concat(#{payCommonProject.chargeCompanyTemporaryName},'%')) + + + + AND (ppc.paid_amount ]]> ppc.invoice_amount or + (ppc.paid_amount is not null and ppc.paid_amount !=0 and ppc.invoice_amount is null)) + + + + AND (ppc.paid_amount ppc.invoice_amount or + (ppc.paid_amount is null and ppc.invoice_amount is not null and ppc.invoice_amount !=0)) + + + AND ppc.income_affirm = #{payCommonProject.affirmIncome} + )p LEFT JOIN pay_payment_record ppr ON ppr.project_id = p.id