From 9db8911b962cb9fe8b5a148f5c848c77550ec4ce Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 22 Jul 2024 17:56:25 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=BB=9F=E8=AE=A1=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=EF=BC=8C=E5=85=A8=E6=89=80=E7=BB=9F=E8=AE=A1=E5=8C=85=E5=90=AB?=
 =?UTF-8?q?23=E5=B9=B4=E5=8F=8A=E4=B9=8B=E5=89=8D=E7=9A=84=E6=89=93?=
 =?UTF-8?q?=E5=8C=85=E5=AD=90=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/db/统计视图（新）.sql b/db/统计视图（新）.sql
index 00ef2e6e..6cf1a284 100644
--- a/db/统计视图（新）.sql
+++ b/db/统计视图（新）.sql
@@ -578,7 +578,7 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on pwgs.id = vcpr.project_id
                left join v_payment_record vpr on pwgs.id = vpr.project_id
                left join v_mail_bill_project vmbp on pwgs.id = vmbp.project_id
-      where pack = 0
+      where pack = 0 or year < 2024
       group by pwgs.id
       union all
       SELECT pcp.id,
@@ -614,7 +614,7 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on pcp.id = vcpr.project_id
                left join v_payment_record vpr on pcp.id = vpr.project_id
                left join v_mail_bill_project vmbp on pcp.id = vmbp.project_id
-      where pack = 0
+      where pack = 0 or year < 2024
       group by pcp.id
       union all
       SELECT pmps.id,
@@ -651,7 +651,7 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on pmps.id = vcpr.project_id
                left join v_payment_record vpr on pmps.id = vpr.project_id
                left join v_mail_bill_project vmbp on pmps.id = vmbp.project_id
-      where pack = 0
+      where pack = 0 or particular_year < 2024
       group by pmps.id
       union all
       SELECT pms.id,
@@ -688,7 +688,7 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on pms.id = vcpr.project_id
                left join v_payment_record vpr on pms.id = vpr.project_id
                left join v_mail_bill_project vmbp on pms.id = vmbp.project_id
-      where pack = 0
+      where pack = 0 or particular_year < 2024
       group by pms.id
       union all
       SELECT tmps.id,
@@ -725,7 +725,7 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on tmps.id = vcpr.project_id
                left join v_payment_record vpr on tmps.id = vpr.project_id
                left join v_mail_bill_project vmbp on tmps.id = vmbp.project_id
-      where pack = 0
+      where pack = 0 or year < 2024
       group by tmps.id
       union all
       SELECT tcp.id,
@@ -762,43 +762,43 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on tcp.id = vcpr.project_id
                left join v_payment_record vpr on tcp.id = vpr.project_id
                left join v_mail_bill_project vmbp on tcp.id = vmbp.project_id
-        where pack = 0
+        where pack = 0 or year < 2024
       group by tcp.id
-#       UNION ALL
-#       SELECT
-#           ppc.id AS id,
-#           ppc.id AS superId,
-#           ppc.company_temporary_name AS projectName,
-#           ppc.pack_principal_name AS principalName,
-#           ppc.company_id AS chargeCompanyId,
-#           ppc.company_temporary_id AS chargeCompanyTemporaryId,
-#           ppc.company_temporary_name AS chargeCompanyTemporaryName,
-#           22 AS chargeUse,
-#           sd.depart_name AS depart,
-#           1 AS pack,
-#           ppc.pack_year AS year,
-#           ppc.in_account AS payStatue,
-#           sd.org_code AS departCode,
-#           sd.id AS departId,
-#           ppc.pack_principal_id AS principalNameId,
-#           8 AS type,
-#           ppc.receivable_amount AS receivableAmount,
-#           ppc.no_tax_amount AS allMoney,
-#           ppc.paid_amount AS comeAllMoney,
-#           ppc.invoice_amount AS billMoney,
-#           ppc.confirm_amount AS confirmAmount,
-#           ppc.paid_no_tax_amount AS paidNoTaxAmount,
-#           ppc.invoice_no_tax_amount AS invoiceNoTaxAmount,
-#           ppc.confirm_no_tax_amount AS confirmNoTaxAmount,
-#           ppc.pack_contact_temporary_name AS contactsName,
-#           group_concat( date_format( pcpr.payment_date, '%Y-%m' ) SEPARATOR ',' ) AS confirmDate,
-#           ppc.create_time AS createTime
-#       FROM pay_pack_company ppc
-#                LEFT JOIN sys_user su ON ppc.pack_principal_id = su.id
-#                LEFT JOIN sys_depart sd ON su.depart_ids = sd.id
-#                LEFT JOIN pay_confirm_payment_record pcpr ON ppc.id = pcpr.project_id
-#       GROUP BY
-#           ppc.id
+      UNION ALL
+      SELECT
+          ppc.id AS id,
+          ppc.id AS superId,
+          ppc.company_temporary_name AS projectName,
+          ppc.pack_principal_name AS principalName,
+          ppc.company_id AS chargeCompanyId,
+          ppc.company_temporary_id AS chargeCompanyTemporaryId,
+          ppc.company_temporary_name AS chargeCompanyTemporaryName,
+          22 AS chargeUse,
+          sd.depart_name AS depart,
+          1 AS pack,
+          ppc.pack_year AS year,
+          ppc.in_account AS payStatue,
+          sd.org_code AS departCode,
+          sd.id AS departId,
+          ppc.pack_principal_id AS principalNameId,
+          8 AS type,
+          ppc.receivable_amount AS receivableAmount,
+          ppc.no_tax_amount AS allMoney,
+          ppc.paid_amount AS comeAllMoney,
+          ppc.invoice_amount AS billMoney,
+          ppc.confirm_amount AS confirmAmount,
+          ppc.paid_no_tax_amount AS paidNoTaxAmount,
+          ppc.invoice_no_tax_amount AS invoiceNoTaxAmount,
+          ppc.confirm_no_tax_amount AS confirmNoTaxAmount,
+          ppc.pack_contact_temporary_name AS contactsName,
+          group_concat( date_format( pcpr.payment_date, '%Y-%m' ) SEPARATOR ',' ) AS confirmDate,
+          ppc.create_time AS createTime
+      FROM pay_pack_company ppc
+               LEFT JOIN sys_user su ON ppc.pack_principal_id = su.id
+               LEFT JOIN sys_depart sd ON su.depart_ids = sd.id
+               LEFT JOIN pay_confirm_payment_record pcpr ON ppc.id = pcpr.project_id
+      GROUP BY
+          ppc.id
      ) pp
 order by pp.createTime;
 
@@ -931,7 +931,7 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on pwgs.id = vcpr.project_id
                left join v_payment_record vpr on pwgs.id = vpr.project_id
                left join v_mail_bill_project vmbp on pwgs.id = vmbp.project_id
-      where pack = 0
+      where pack = 0 or year < 2024
       group by pwgs.id
       union all
       SELECT pcp.id,
@@ -968,7 +968,7 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on pcp.id = vcpr.project_id
                left join v_payment_record vpr on pcp.id = vpr.project_id
                left join v_mail_bill_project vmbp on pcp.id = vmbp.project_id
-      where pack = 0
+      where pack = 0 or year < 2024
       group by pcp.id
       union all
       SELECT pmps.id,
@@ -1006,7 +1006,7 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on pmps.id = vcpr.project_id
                left join v_payment_record vpr on pmps.id = vpr.project_id
                left join v_mail_bill_project vmbp on pmps.id = vmbp.project_id
-      where pack = 0
+      where pack = 0 or particular_year < 2024
       group by pmps.id
       union all
       SELECT pms.id,
@@ -1044,7 +1044,7 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on pms.id = vcpr.project_id
                left join v_payment_record vpr on pms.id = vpr.project_id
                left join v_mail_bill_project vmbp on pms.id = vmbp.project_id
-      where pack = 0
+      where pack = 0 or particular_year < 2024
       group by pms.id
       union all
       SELECT tmps.id,
@@ -1082,7 +1082,7 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on tmps.id = vcpr.project_id
                left join v_payment_record vpr on tmps.id = vpr.project_id
                left join v_mail_bill_project vmbp on tmps.id = vmbp.project_id
-      where pack = 0
+      where pack = 0 or year < 2024
       group by tmps.id
       union all
       SELECT tcp.id,
@@ -1120,7 +1120,7 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on tcp.id = vcpr.project_id
                left join v_payment_record vpr on tcp.id = vpr.project_id
                left join v_mail_bill_project vmbp on tcp.id = vmbp.project_id
-      where pack = 0
+      where pack = 0 or year < 2024
       group by tcp.id
       union all
       SELECT
@@ -1231,7 +1231,7 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on pwgs.id = vcpr.project_id
                left join v_payment_record vpr on pwgs.id = vpr.project_id
                left join v_mail_bill_project vmbp on pwgs.id = vmbp.project_id
-      where pack = 0
+      where pack = 0 or year < 2024
       group by pwgs.id
       union all
       SELECT pcp.id,
@@ -1268,7 +1268,7 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on pcp.id = vcpr.project_id
                left join v_payment_record vpr on pcp.id = vpr.project_id
                left join v_mail_bill_project vmbp on pcp.id = vmbp.project_id
-      where pack = 0
+      where pack = 0 or year < 2024
       group by pcp.id
       union all
       SELECT pmps.id,
@@ -1306,7 +1306,7 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on pmps.id = vcpr.project_id
                left join v_payment_record vpr on pmps.id = vpr.project_id
                left join v_mail_bill_project vmbp on pmps.id = vmbp.project_id
-      where pack = 0
+      where pack = 0 or particular_year < 2024
       group by pmps.id
       union all
       SELECT pms.id,
@@ -1344,7 +1344,7 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on pms.id = vcpr.project_id
                left join v_payment_record vpr on pms.id = vpr.project_id
                left join v_mail_bill_project vmbp on pms.id = vmbp.project_id
-      where pack = 0
+      where pack = 0 or particular_year < 2024
       group by pms.id
       union all
       SELECT tmps.id,
@@ -1382,7 +1382,7 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on tmps.id = vcpr.project_id
                left join v_payment_record vpr on tmps.id = vpr.project_id
                left join v_mail_bill_project vmbp on tmps.id = vmbp.project_id
-      where pack = 0
+      where pack = 0 or year < 2024
       group by tmps.id
       union all
       SELECT tcp.id,
@@ -1420,7 +1420,7 @@ from (SELECT pwgs.id,
                left join v_confirm_payment_record vcpr on tcp.id = vcpr.project_id
                left join v_payment_record vpr on tcp.id = vpr.project_id
                left join v_mail_bill_project vmbp on tcp.id = vmbp.project_id
-      where pack = 0
+      where pack = 0 or year < 2024
       group by tcp.id
       UNION ALL
       SELECT