purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决账户流水里面涉及转账的时候未去重的bug

Browse Source
This commit is contained in:
jishenghua
2024-06-06 00:18:50 +08:00
parent c2f757a7ac
commit d2f3e3d5e9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jshERP-boot/src/main/resources/mapper_xml/AccountMapperEx.xml
View File

@@ -286,7 +286,7 @@
<!--主表中转出的账户 --> <!--主表中转出的账户 -->
UNION ALL UNION ALL
select ah.bill_no,ah.type as newType, 'financial' as fromType, '' as sName,ah.change_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,ah.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' from jsh_account_head ah
where ah.type='转账' where ah.type='转账'
<if test="accountId != null"> <if test="accountId != null">
and ah.account_id=#{accountId} and ah.account_id=#{accountId}
@@ -417,7 +417,7 @@
<!--主表中转出的账户 --> <!--主表中转出的账户 -->
UNION ALL UNION ALL
select count(1) a select count(1) a
from jsh_account_head ah left join jsh_account_item ai on ai.header_id=ah.id and ifnull(ai.delete_flag,'0') !='1' from jsh_account_head ah
where ah.type='转账' where ah.type='转账'
<if test="accountId != null"> <if test="accountId != null">
and ah.account_id=#{accountId} and ah.account_id=#{accountId}