From 425236e31232acc740450539d03f6bb22f2f7799 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Sun, 10 Mar 2024 21:43:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B4=A6=E6=88=B7=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E7=9A=84=E6=B5=81=E6=B0=B4=E5=88=97=E8=A1=A8=EF=BC=8C?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=87=91=E9=A2=9D=E4=B8=BA0=E7=9A=84?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper_xml/AccountMapperEx.xml     | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/jshERP-boot/src/main/resources/mapper_xml/AccountMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/AccountMapperEx.xml
index 8eed35db..ef036515 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/AccountMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/AccountMapperEx.xml
@@ -230,6 +230,7 @@
         <if test="accountId != null">
             and dh.account_id=#{accountId}
         </if>
+        and ifnull(dh.change_amount, 0)!=0
         and ifnull(dh.delete_flag,'0') !='1'
         <!--主表收入和支出涉及的账户 -->
         UNION ALL
@@ -239,16 +240,18 @@
         <if test="accountId != null">
             and ah.account_id=#{accountId}
         </if>
+        and ifnull(ah.change_amount, 0)!=0
         and ifnull(ah.delete_flag,'0') !='1'
         <!--明细中涉及的账户（收款,付款,收预付款） -->
         UNION ALL
-        select ah.bill_no,ah.type as newType, 'financial' as fromType, s.supplier,ai.each_amount,date_format(ah.bill_time,'%Y-%m-%d %H:%i:%S') as oTime,'' as AList,'' as AMList
+        select ah.bill_no,ah.type as newType, 'financial' as fromType, s.supplier,ai.each_amount change_amount,date_format(ah.bill_time,'%Y-%m-%d %H:%i:%S') as oTime,'' as AList,'' as AMList
         from jsh_account_head ah left join jsh_supplier s on ah.organ_id=s.id
         left join jsh_account_item ai on ai.header_id=ah.id and ifnull(ai.delete_flag,'0') !='1'
         where ah.type in ('收款','付款','收预付款')
         <if test="accountId != null">
             and ai.account_id=#{accountId}
         </if>
+        and ifnull(ai.each_amount, 0)!=0
         and ifnull(ah.delete_flag,'0') !='1'
         <!--主表中转出的账户 -->
         UNION ALL
@@ -258,15 +261,17 @@
         <if test="accountId != null">
             and ah.account_id=#{accountId}
         </if>
+        and ifnull(ah.change_amount, 0)!=0
         and ifnull(ah.delete_flag,'0') !='1'
         <!--明细中被转入的账户 -->
         UNION ALL
-        select ah.bill_no,ah.type as newType, 'financial' as fromType, '' as sName,ai.each_amount,date_format(ah.bill_time,'%Y-%m-%d %H:%i:%S') as oTime,'' as AList,'' as AMList
+        select ah.bill_no,ah.type as newType, 'financial' as fromType, '' as sName,ai.each_amount change_amount,date_format(ah.bill_time,'%Y-%m-%d %H:%i:%S') as oTime,'' as AList,'' as AMList
         from jsh_account_head ah left join jsh_account_item ai on ai.header_id=ah.id and ifnull(ai.delete_flag,'0') !='1'
         where ah.type='转账'
         <if test="accountId != null">
             and ai.account_id=#{accountId}
         </if>
+        and ifnull(ai.each_amount, 0)!=0
         and ifnull(ah.delete_flag,'0') !='1'
         <!--多账户的情况 -->
         UNION ALL
@@ -278,6 +283,7 @@
             <bind name="bindAccountId" value="'%'+accountId+'%'"/>
             and dh.account_id_list like #{bindAccountId}
         </if>
+        and ifnull(dh.change_amount, 0)!=0
         and ifnull(dh.delete_flag,'0') !='1'
         ORDER BY oTime desc
         <if test="offset != null and rows != null">
@@ -295,6 +301,7 @@
             <if test="accountId != null">
                 and dh.account_id=#{accountId}
             </if>
+            and ifnull(dh.change_amount, 0)!=0
             and ifnull(dh.delete_flag,'0') !='1'
             <!--主表收入和支出涉及的账户 -->
             UNION ALL
@@ -304,6 +311,7 @@
             <if test="accountId != null">
                 and ah.account_id=#{accountId}
             </if>
+            and ifnull(ah.change_amount, 0)!=0
             and ifnull(ah.delete_flag,'0') !='1'
             <!--明细中涉及的账户（收款,付款,收预付款） -->
             UNION ALL
@@ -314,6 +322,7 @@
             <if test="accountId != null">
                 and ai.account_id=#{accountId}
             </if>
+            and ifnull(ai.each_amount, 0)!=0
             and ifnull(ah.delete_flag,'0') !='1'
             <!--主表中转出的账户 -->
             UNION ALL
@@ -323,6 +332,7 @@
             <if test="accountId != null">
                 and ah.account_id=#{accountId}
             </if>
+            and ifnull(ah.change_amount, 0)!=0
             and ifnull(ah.delete_flag,'0') !='1'
             <!--明细中被转入的账户 -->
             UNION ALL
@@ -332,6 +342,7 @@
             <if test="accountId != null">
                 and ai.account_id=#{accountId}
             </if>
+            and ifnull(ai.each_amount, 0)!=0
             and ifnull(ah.delete_flag,'0') !='1'
             <!--多账户的情况 -->
             UNION ALL
@@ -342,6 +353,7 @@
                 <bind name="bindAccountId" value="'%'+accountId+'%'"/>
                 and dh.account_id_list like #{bindAccountId}
             </if>
+            and ifnull(dh.change_amount, 0)!=0
             and ifnull(dh.delete_flag,'0') !='1'
         ) cc
     </select>