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 @@ and dh.account_id=#{accountId} + and ifnull(dh.change_amount, 0)!=0 and ifnull(dh.delete_flag,'0') !='1' UNION ALL @@ -239,16 +240,18 @@ and ah.account_id=#{accountId} + 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 ('收款','付款','收预付款') and ai.account_id=#{accountId} + and ifnull(ai.each_amount, 0)!=0 and ifnull(ah.delete_flag,'0') !='1' UNION ALL @@ -258,15 +261,17 @@ and ah.account_id=#{accountId} + 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='转账' and ai.account_id=#{accountId} + and ifnull(ai.each_amount, 0)!=0 and ifnull(ah.delete_flag,'0') !='1' UNION ALL @@ -278,6 +283,7 @@ and dh.account_id_list like #{bindAccountId} + and ifnull(dh.change_amount, 0)!=0 and ifnull(dh.delete_flag,'0') !='1' ORDER BY oTime desc @@ -295,6 +301,7 @@ and dh.account_id=#{accountId} + and ifnull(dh.change_amount, 0)!=0 and ifnull(dh.delete_flag,'0') !='1' UNION ALL @@ -304,6 +311,7 @@ and ah.account_id=#{accountId} + and ifnull(ah.change_amount, 0)!=0 and ifnull(ah.delete_flag,'0') !='1' UNION ALL @@ -314,6 +322,7 @@ and ai.account_id=#{accountId} + and ifnull(ai.each_amount, 0)!=0 and ifnull(ah.delete_flag,'0') !='1' UNION ALL @@ -323,6 +332,7 @@ and ah.account_id=#{accountId} + and ifnull(ah.change_amount, 0)!=0 and ifnull(ah.delete_flag,'0') !='1' UNION ALL @@ -332,6 +342,7 @@ and ai.account_id=#{accountId} + and ifnull(ai.each_amount, 0)!=0 and ifnull(ah.delete_flag,'0') !='1' UNION ALL @@ -342,6 +353,7 @@ and dh.account_id_list like #{bindAccountId} + and ifnull(dh.change_amount, 0)!=0 and ifnull(dh.delete_flag,'0') !='1' ) cc