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

fix 87854 首页--收入分类统计--收入分析--普通项目分类是工作组经费选择合同--没有划分到项目合作经费里

Browse Source
This commit is contained in:
lijiarao
2024-07-31 14:01:19 +08:00
parent 38b1615995
commit 56f8b09125
1 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/统计视图（新）.sql
+35
View File
@@ -1568,6 +1568,40 @@ from (
and (pack = 0 or year < 2024)
group by pwgs.id
union all
SELECT pcp.id,
pcp.id as superId,
pcp.charge_project AS projectName,
pcp.principal_name as principalName,
pcp.charge_company_id AS chargeCompanyId,
pcp.charge_company_temporary_id as chargeCompanyTemporaryId,
pcp.charge_company_temporary_name AS chargeCompanyTemporaryName,
pcp.no_tax_amount as allMoney,
pcp.paid_amount as comeAllMoney,
16 as chargeUse,
sd.depart_name as depart,
pcp.pack as pack,
pcp.year as year,
pcp.in_account as payStatue,
sd.org_code as departCode,
sd.id as departId,
pcp.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,
contacts_temporary_name as contactsName,
GROUP_CONCAT(DATE_FORMAT(pcpr.payment_date,'%Y-%m')) as confirmDate,
pcp.create_time as createTime
FROM pay_common_project pcp
left JOIN sys_user su on (pcp.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
where (pack = 0 or year < 2024)
and charge_way = 2
group by pcp.id
union all
SELECT pcp.id,
pcp.id as superId,
pcp.charge_project AS projectName,
@@ -1599,6 +1633,7 @@ from (
left join sys_depart sd on (su.depart_ids = sd.id)
left join pay_confirm_payment_record pcpr on pcp.id = pcpr.project_id
where (pack = 0 or year < 2024)
and charge_way != 2
group by pcp.id
union all
SELECT pmps.id,