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

给账户的流水页面增加备注返回值

Browse Source
This commit is contained in:
jishenghua
2025-06-10 23:32:09 +08:00
parent 04e5b65fdf
commit 6a2d847f08
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -201,7 +201,8 @@
<select id="findAccountInOutList" parameterType="com.jsh.erp.datasource.entities.AccountExample" resultMap="ResultInOutList">
<!--主表出入库涉及的账户 -->
select dh.number,concat(dh.sub_type,dh.type) as newType, 'bill' as fromType, s.supplier,dh.change_amount,date_format(dh.oper_time,'%Y-%m-%d %H:%i:%S') as oTime,'' as AList,'' as AMList
select dh.number,concat(dh.sub_type,dh.type) as newType, 'bill' as fromType, s.supplier,dh.change_amount,
date_format(dh.oper_time,'%Y-%m-%d %H:%i:%S') as oTime,'' as AList,'' as AMList, dh.remark
from jsh_depot_head dh left join jsh_supplier s on dh.organ_id = s.id and ifnull(s.delete_flag,'0') !='1'
where 1=1
<if test="accountId != null">
@@ -224,7 +225,8 @@
and ifnull(dh.delete_flag,'0') !='1'
<!--主表收入和支出涉及的账户 -->
UNION ALL
select ah.bill_no,ah.type as newType, 'financial' as fromType, s.supplier,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, s.supplier,ah.change_amount,
date_format(ah.bill_time,'%Y-%m-%d %H:%i:%S') as oTime,'' as AList,'' as AMList, ah.remark
from jsh_account_head ah left join jsh_supplier s on ah.organ_id=s.id and ifnull(s.delete_flag,'0') !='1'
where ah.type!='转账'
<if test="accountId != null">
@@ -247,7 +249,8 @@
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 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, s.supplier,ai.each_amount change_amount,
date_format(ah.bill_time,'%Y-%m-%d %H:%i:%S') as oTime,'' as AList,'' as AMList, ah.remark
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 ('收款','付款','收预付款')
@@ -271,7 +274,8 @@
and ifnull(ah.delete_flag,'0') !='1'
<!--主表中转出的账户 -->
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, ah.remark
from jsh_account_head ah
where ah.type='转账'
<if test="accountId != null">
@@ -294,7 +298,8 @@
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 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,ai.each_amount change_amount,
date_format(ah.bill_time,'%Y-%m-%d %H:%i:%S') as oTime,'' as AList,'' as AMList, ah.remark
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">
@@ -317,8 +322,9 @@
and ifnull(ah.delete_flag,'0') !='1'
<!--多账户的情况 -->
UNION ALL
select dh.number,concat(dh.sub_type,dh.type) as newType, 'bill' as fromType, s.supplier,dh.change_amount,date_format(dh.oper_time,'%Y-%m-%d %H:%i:%S') as oTime,
dh.account_id_list as AList,dh.account_money_list as AMList
select dh.number,concat(dh.sub_type,dh.type) as newType, 'bill' as fromType, s.supplier,dh.change_amount,
date_format(dh.oper_time,'%Y-%m-%d %H:%i:%S') as oTime,
dh.account_id_list as AList,dh.account_money_list as AMList, dh.remark
from jsh_depot_head dh left join jsh_supplier s on dh.organ_id = s.id and ifnull(s.delete_flag,'0') !='1'
where 1=1
<if test="accountId != null">