From ecae0a80ae4698a5287c90179bc9c5b725c68e42 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 12 Dec 2022 14:27:21 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=A7=91=E5=AE=A4=E6=80=BB=E4=BD=93?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/PayWorkingGroupMapper.xml      | 40 +++++++++++--------
 1 file changed, 24 insertions(+), 16 deletions(-)

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 76baaca2..d9482a31 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
@@ -2382,25 +2382,33 @@
     </select>
 
     <select id="overallDepartmentStatistics" resultType="com.jero.statistics.entity.DepartStatistics">
-        select
-        sum(no_tax_amount) as confirmAmount,
-        v.depart as departName
-        from pay_confirm_payment_record pcpr left join v_statistical v on pcpr.project_id = v.projectId
-        <where>
-            DATE_FORMAT (payment_date,'%Y') like concat(#{year}, '%')
-        </where>
-        group by departCode
+        select sd.depart_name,IFNULL(a.confirmAmount,0) as confirmAmount
+        from sys_depart sd left join (
+            select
+            sum(no_tax_amount) as confirmAmount,
+            v.depart as departName
+            from pay_confirm_payment_record pcpr left join v_statistical v on pcpr.project_id = v.projectId
+            <where>
+                DATE_FORMAT (payment_date,'%Y') like concat(#{year}, '%')
+            </where>
+            group by departCode) a
+        on sd.depart_name = a.departName
+        where sd.org_code != 'A05'
     </select>
 
     <select id="allDepartmentStatistics" resultType="com.jero.statistics.entity.DepartStatistics">
-        select
-        sum(allMoney) as allMoney,
-        v.depart as departName
-        from v_statistical v
-        <where>
-            year = #{year}
-        </where>
-        group by departCode
+        select sd.depart_name,IFNULL(a.allMoney,0) as allMoney
+        from sys_depart sd left join (
+            select
+            sum(allMoney) as allMoney,
+            v.depart as departName
+            from v_statistical v
+            <where>
+                year = #{year}
+            </where>
+            group by departCode) a
+        on sd.depart_name = a.departName
+        where sd.org_code != 'A05'
         order by allMoney desc
     </select>
 </mapper>