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

add 首页 收入分类统计 增加打包

Browse Source
This commit is contained in:
lijiarao
2024-04-16 12:01:50 +08:00
parent ef574d24f5
commit 4f0bc334c5
1 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+32
View File
@@ -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