From 4f0bc334c57fb0ceaa7270fe5426c92c94037fe0 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 16 Apr 2024 12:01:50 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E9=A6=96=E9=A1=B5=20=E6=94=B6=E5=85=A5?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=BB=9F=E8=AE=A1=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/PayWorkingGroupMapper.xml | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml index 089214c2..29ceac74 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml @@ -2375,6 +2375,38 @@ left join sys_depart sd on (su.depart_ids = sd.id) left join pay_confirm_payment_record pcpr on tcp.id = pcpr.project_id group by tcp.id + union all + SELECT pcp.id, + pcp.id as superId, + pcp.company_temporary_name AS projectName, + pcp.pack_principal_name as principalName, + pcp.company_id AS chargeCompanyId, + pcp.company_temporary_id as chargeCompanyTemporaryId, + pcp.company_temporary_name AS chargeCompanyTemporaryName, + pcp.no_tax_amount as allMoney, + pcp.paid_amount as comeAllMoney, + 22 as chargeUse, + sd.depart_name as depart, + 1 as pack, + pcp.pack_year as year, + pcp.in_account as payStatue, + sd.org_code as departCode, + sd.id as departId, + pcp.pack_principal_id as principalNameId, + 1 as type, + pcp.invoice_amount AS billMoney, + confirm_amount as confirmAmount, + invoice_no_tax_amount as invoiceNoTaxAmount, + paid_no_tax_amount as paidNoTaxAmount, + confirm_no_tax_amount as confirmNoTaxAmount, + pack_contact_temporary_name as contactsName, + GROUP_CONCAT(DATE_FORMAT(pcpr.payment_date,'%Y-%m')) as confirmDate, + pcp.create_time as createTime + FROM pay_pack_company pcp + left JOIN sys_user su on (pcp.pack_principal_id = su.id) + left join sys_depart sd on (su.depart_ids = sd.id) + left join pay_confirm_payment_record pcpr on pcp.id = pcpr.project_id + group by pcp.id ) pp where pp.allMoney is not null and pp.allMoney != 0