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
da9c3176
Commit
da9c3176
authored
Apr 30, 2021
by
季圣华
Browse files
解决账户统计报表展示金额的bug
parent
ec45e0cf
Changes
2
Hide whitespace changes
Inline
Side-by-side
jshERP-boot/src/main/java/com/jsh/erp/controller/AccountController.java
View file @
da9c3176
...
...
@@ -115,6 +115,7 @@ public class AccountController {
BigDecimal
balance
=
accountService
.
getAccountSum
(
accountId
,
timeStr
,
"date"
).
add
(
accountService
.
getAccountSumByHead
(
accountId
,
timeStr
,
"date"
))
.
add
(
accountService
.
getAccountSumByDetail
(
accountId
,
timeStr
,
"date"
)).
add
(
accountService
.
getManyAccountSum
(
accountId
,
timeStr
,
"date"
)).
add
(
initialAmount
);
aEx
.
setBalance
(
balance
);
aEx
.
setAccountId
(
accountId
);
dataArray
.
add
(
aEx
);
}
}
...
...
jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/AccountVo4InOutList.java
View file @
da9c3176
...
...
@@ -4,6 +4,8 @@ import java.math.BigDecimal;
public
class
AccountVo4InOutList
{
private
Long
accountId
;
private
String
number
;
private
String
type
;
...
...
@@ -24,6 +26,14 @@ public class AccountVo4InOutList {
private
Long
tenantId
;
public
Long
getAccountId
()
{
return
accountId
;
}
public
void
setAccountId
(
Long
accountId
)
{
this
.
accountId
=
accountId
;
}
public
String
getNumber
()
{
return
number
;
}
...
...
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