LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 到账开票列表查询

Browse Source
This commit is contained in:
lijiarao
2024-08-06 15:14:52 +08:00
parent 49c8ce6ad3
commit c79478d8bf
1 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml
+33 -31
View File
@@ -279,37 +279,39 @@
<if test="payCommonProject.affirmIncome != null">
AND tcp.affirm_income = #{payCommonProject.affirmIncome}
</if>
<!-- 打包项目-->
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,1 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,0 AS admin_add_flag
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 <![CDATA[<>]]> 0
and ppc.receivable_amount is not null
<if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
AND pay_company_management.company_name like concat('%',#{payCommonProject.chargeCompanyTemporaryName},'%')
</if>
<if test="payCommonProject.principalId != null and payCommonProject.principalId != ''">
AND ppc.pack_principal_id = #{payCommonProject.principalId}
</if>
<if test="payCommonProject.chargeProject != null and payCommonProject.chargeProject != ''">
AND ppc.company_temporary_name like concat('%',concat(#{payCommonProject.chargeProject},'%'))
</if>
<!-- 来款未开票 -->
<if test='paidInvoicStatus != null and paidInvoicStatus == "1"'>
AND (ppc.paid_amount <![CDATA[>]]> ppc.invoice_amount or
(ppc.paid_amount is not null and ppc.paid_amount !=0 and ppc.invoice_amount is null))
</if>
<!-- 开票未来款 -->
<if test='paidInvoicStatus != null and paidInvoicStatus == "2"'>
AND (ppc.paid_amount <![CDATA[<]]> ppc.invoice_amount or
(ppc.paid_amount is null and ppc.invoice_amount is not null and ppc.invoice_amount !=0))
</if>
<if test="payCommonProject.affirmIncome != null">
AND ppc.income_affirm = #{payCommonProject.affirmIncome}
<if test="payCommonProject.paymentStatus == null">
<!-- 打包项目-->
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,1 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,0 AS admin_add_flag
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 <![CDATA[<>]]> 0
and ppc.receivable_amount is not null
<if test="payCommonProject.chargeCompanyTemporaryName != null and payCommonProject.chargeCompanyTemporaryName != ''">
AND pay_company_management.company_name like concat('%',#{payCommonProject.chargeCompanyTemporaryName},'%')
</if>
<if test="payCommonProject.principalId != null and payCommonProject.principalId != ''">
AND ppc.pack_principal_id = #{payCommonProject.principalId}
</if>
<if test="payCommonProject.chargeProject != null and payCommonProject.chargeProject != ''">
AND ppc.company_temporary_name like concat('%',concat(#{payCommonProject.chargeProject},'%'))
</if>
<!-- 来款未开票 -->
<if test='paidInvoicStatus != null and paidInvoicStatus == "1"'>
AND (ppc.paid_amount <![CDATA[>]]> ppc.invoice_amount or
(ppc.paid_amount is not null and ppc.paid_amount !=0 and ppc.invoice_amount is null))
</if>
<!-- 开票未来款 -->
<if test='paidInvoicStatus != null and paidInvoicStatus == "2"'>
AND (ppc.paid_amount <![CDATA[<]]> ppc.invoice_amount or
(ppc.paid_amount is null and ppc.invoice_amount is not null and ppc.invoice_amount !=0))
</if>
<if test="payCommonProject.affirmIncome != null">
AND ppc.income_affirm = #{payCommonProject.affirmIncome}
</if>
</if>
)p
LEFT JOIN pay_payment_record ppr ON ppr.project_id = p.id