Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
JSH ERP
Commits
f5d1af39
Commit
f5d1af39
authored
May 10, 2020
by
季圣华
Browse files
解决结算账户流水里面缺少零售的bug
parent
da458e9d
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/main/resources/mapper_xml/AccountMapperEx.xml
View file @
f5d1af39
...
@@ -119,7 +119,7 @@
...
@@ -119,7 +119,7 @@
(
(
<!--主表出入库涉及的账户 -->
<!--主表出入库涉及的账户 -->
select count(1) a
select count(1) a
from jsh_depothead dh
inner
join jsh_supplier s on dh.OrganId = s.id and ifnull(s.delete_Flag,'0') !='1'
from jsh_depothead dh
left
join jsh_supplier s on dh.OrganId = s.id and ifnull(s.delete_Flag,'0') !='1'
where 1=1
where 1=1
<if
test=
"accountId != null"
>
<if
test=
"accountId != null"
>
and dh.AccountId=${accountId}
and dh.AccountId=${accountId}
...
@@ -128,7 +128,7 @@
...
@@ -128,7 +128,7 @@
<!--主表收入和支出涉及的账户 -->
<!--主表收入和支出涉及的账户 -->
UNION ALL
UNION ALL
select count(1) a
select count(1) a
from jsh_accounthead ah
inner
join jsh_supplier s on ah.OrganId=s.id and ifnull(s.delete_Flag,'0') !='1'
from jsh_accounthead ah
left
join jsh_supplier s on ah.OrganId=s.id and ifnull(s.delete_Flag,'0') !='1'
where 1=1
where 1=1
<if
test=
"accountId != null"
>
<if
test=
"accountId != null"
>
and ah.AccountId=${accountId}
and ah.AccountId=${accountId}
...
@@ -137,7 +137,7 @@
...
@@ -137,7 +137,7 @@
<!--明细中涉及的账户(收款,付款,收预付款) -->
<!--明细中涉及的账户(收款,付款,收预付款) -->
UNION ALL
UNION ALL
select count(1) a
select count(1) a
from jsh_accounthead ah
inner
join jsh_supplier s on ah.OrganId=s.id
from jsh_accounthead ah
left
join jsh_supplier s on ah.OrganId=s.id
inner join jsh_accountitem ai on ai.HeaderId=ah.Id and ifnull(ai.delete_Flag,'0') !='1'
inner join jsh_accountitem ai on ai.HeaderId=ah.Id and ifnull(ai.delete_Flag,'0') !='1'
where ah.Type in ('收款','付款','收预付款')
where ah.Type in ('收款','付款','收预付款')
<if
test=
"accountId != null"
>
<if
test=
"accountId != null"
>
...
@@ -165,7 +165,7 @@
...
@@ -165,7 +165,7 @@
<!--多账户的情况 -->
<!--多账户的情况 -->
UNION ALL
UNION ALL
select count(1) a
select count(1) a
from jsh_depothead dh
inner
join jsh_supplier s on dh.OrganId = s.id and ifnull(s.delete_Flag,'0') !='1'
from jsh_depothead dh
left
join jsh_supplier s on dh.OrganId = s.id and ifnull(s.delete_Flag,'0') !='1'
where 1=1
where 1=1
<if
test=
"accountId != null"
>
<if
test=
"accountId != null"
>
and dh.AccountIdList like '%${accountId}%'
and dh.AccountIdList like '%${accountId}%'
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment