Commit 8a1ea045 authored by 季圣华's avatar 季圣华
Browse files

解决账户流水记录的bug

parent 016c3cda
......@@ -82,12 +82,11 @@
and dh.account_id=#{accountId}
</if>
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
from jsh_account_head ah left join jsh_supplier s on ah.organ_id=s.id and ifnull(s.delete_flag,'0') !='1'
where 1=1
where ah.type!='转账'
<if test="accountId != null">
and ah.account_id=#{accountId}
</if>
......@@ -152,7 +151,7 @@
UNION ALL
select count(1) a
from jsh_account_head ah left join jsh_supplier s on ah.organ_id=s.id and ifnull(s.delete_flag,'0') !='1'
where 1=1
where ah.type!='转账'
<if test="accountId != null">
and ah.account_id=#{accountId}
</if>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment