From 56f8b0912506349118e9b145e1926f6f4d62f07f Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 31 Jul 2024 14:01:19 +0800
Subject: [PATCH] =?UTF-8?q?fix=2087854=20=E9=A6=96=E9=A1=B5--=E6=94=B6?=
 =?UTF-8?q?=E5=85=A5=E5=88=86=E7=B1=BB=E7=BB=9F=E8=AE=A1--=E6=94=B6?=
 =?UTF-8?q?=E5=85=A5=E5=88=86=E6=9E=90--=E6=99=AE=E9=80=9A=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=88=86=E7=B1=BB=E6=98=AF=E5=B7=A5=E4=BD=9C=E7=BB=84?=
 =?UTF-8?q?=E7=BB=8F=E8=B4=B9=E9=80=89=E6=8B=A9=E5=90=88=E5=90=8C--?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=88=92=E5=88=86=E5=88=B0=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=90=88=E4=BD=9C=E7=BB=8F=E8=B4=B9=E9=87=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/统计视图（新）.sql | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

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,