diff --git a/db/统计视图(新).sql b/db/统计视图(新).sql index 33bf936f..dd6a619e 100644 --- a/db/统计视图(新).sql +++ b/db/统计视图(新).sql @@ -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,