From 2e45b960c690e400bb85889cd5927dfa2e505e50 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 30 Jul 2024 10:07:19 +0800
Subject: [PATCH] =?UTF-8?q?fix=2087714=20=E9=A6=96=E9=A1=B5--=E5=85=A8?=
 =?UTF-8?q?=E9=99=A2=E7=BB=8F=E8=90=A5=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?--=E5=8D=95=E6=9C=88=E3=80=81=E7=B4=AF=E8=AE=A1--=E9=A2=84?=
 =?UTF-8?q?=E4=BC=B0=E6=94=B6=E5=85=A5=E9=87=91=E9=A2=9D--=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E7=BB=9F=E8=AE=A1=E5=B9=B4=E5=BA=A6=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/统计视图（新）.sql                         |  8 +++---
 .../mapper/xml/PayWorkingGroupMapper.xml      | 26 ++++---------------
 2 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/db/统计视图（新）.sql b/db/统计视图（新）.sql
index de0e530d..33bf936f 100644
--- a/db/统计视图（新）.sql
+++ b/db/统计视图（新）.sql
@@ -203,7 +203,7 @@ from (SELECT pwgs.id,
              vcpr.no_tax_amount            as confirmNoTaxAmount,
              liaison_man            as contactsName,
              vcpr.payment_date as confirmDate,
-             null as estimatedArrivalDate,
+             estimated_arrival_date as estimatedArrivalDate,
              tmps.create_time       as createTime
       FROM tb_member_project tmp
                left join tb_member_project_subitem tmps on (tmp.id = tmps.project_id)
@@ -460,7 +460,7 @@ from (SELECT pwgs.id,
              vcpr.no_tax_amount            as confirmNoTaxAmount,
              liaison_man            as contactsName,
              vcpr.payment_date as confirmDate,
-             null as estimatedArrivalDate,
+             estimated_arrival_date as estimatedArrivalDate,
              tmps.create_time       as createTime
       FROM tb_member_project tmp
                left join tb_member_project_subitem tmps on (tmp.id = tmps.project_id)
@@ -1074,7 +1074,7 @@ from (SELECT pwgs.id,
              vcpr.no_tax_amount            as confirmNoTaxAmount,
              liaison_man            as contactsName,
              vcpr.payment_date as confirmDate,
-             null as estimatedArrivalDate,
+             estimated_arrival_date as estimatedArrivalDate,
              tmps.create_time       as createTime
       FROM tb_member_project tmp
                left join tb_member_project_subitem tmps on (tmp.id = tmps.project_id)
@@ -1374,7 +1374,7 @@ from (SELECT pwgs.id,
              vcpr.no_tax_amount            as confirmNoTaxAmount,
              liaison_man            as contactsName,
              vcpr.payment_date as confirmDate,
-             null as estimatedArrivalDate,
+             estimated_arrival_date as estimatedArrivalDate,
              tmps.create_time       as createTime
       FROM tb_member_project tmp
                left join tb_member_project_subitem tmps on (tmp.id = tmps.project_id)
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
index dd99b2ce..9a64c914 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
@@ -2674,27 +2674,11 @@
     <!-- 统计预计到账金额（应收金额） 预计到账日期  -->
     <select id="cumulativeListEstimatedArrivalMoney"
             resultType="com.jero.statistics.entity.AllProjectStatistics">
-        select DATE_FORMAT(paymentDate, '%Y-%m') as paymentDate,sum(estimatedArrivalMoney) as estimatedArrivalMoney from (
-            select no_tax_amount as estimatedArrivalMoney,estimated_arrival_date as paymentDate
-        from  pay_common_project
-        where DATE_FORMAT(estimated_arrival_date, '%Y') = #{paymentYear}
-        and pack = 0
-            union all
-            select no_tax_amount as estimatedArrivalMoney,estimated_arrival_date as paymentDate
-        from  pay_working_group_subitem
-        where DATE_FORMAT(estimated_arrival_date, '%Y') = #{paymentYear}
-        and pack = 0
-            union all
-            select no_tax_amount as estimatedArrivalMoney,estimated_arrival_date as paymentDate
-        from  pay_meeting_situation
-        where DATE_FORMAT(estimated_arrival_date, '%Y') = #{paymentYear}
-        and pack = 0
-            union all
-            select no_tax_amount as estimatedArrivalMoney,estimated_arrival_date as paymentDate
-        from  pay_member_project_subitem
-        where DATE_FORMAT(estimated_arrival_date, '%Y') = #{paymentYear}
-        and pack = 0
-        ) dataAll group by DATE_FORMAT(paymentDate, '%Y-%m') order by paymentDate
+        select DATE_FORMAT(estimatedArrivalDate, '%Y-%m') as paymentDate,
+               sum(allMoney) as estimatedArrivalMoney
+        from v_statistical_pack
+        where DATE_FORMAT(estimatedArrivalDate, '%Y') = #{paymentYear}
+        group by DATE_FORMAT(estimatedArrivalDate, '%Y-%m') order by paymentDate
     </select>
 
     <select id="queryPageListForCompanyClassification"