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

解决账户统计报表展示金额的bug

Browse Source
This commit is contained in:
季圣华
2021-04-30 00:16:53 +08:00
parent ec45e0cf9d
commit da9c31762a
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
jshERP-boot/src/main/java/com/jsh/erp/controller/AccountController.java
View File

@@ -115,6 +115,7 @@ public class AccountController {
BigDecimal balance = accountService.getAccountSum(accountId, timeStr, "date").add(accountService.getAccountSumByHead(accountId, timeStr, "date")) 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); .add(accountService.getAccountSumByDetail(accountId, timeStr, "date")).add(accountService.getManyAccountSum(accountId, timeStr, "date")).add(initialAmount);
aEx.setBalance(balance); aEx.setBalance(balance);
aEx.setAccountId(accountId);
dataArray.add(aEx); dataArray.add(aEx);
} }
} }

10
jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/AccountVo4InOutList.java
View File

@@ -4,6 +4,8 @@ import java.math.BigDecimal;
public class AccountVo4InOutList { public class AccountVo4InOutList {
private Long accountId;
private String number; private String number;
private String type; private String type;
@@ -24,6 +26,14 @@ public class AccountVo4InOutList {
private Long tenantId; private Long tenantId;
public Long getAccountId() {
return accountId;
}
public void setAccountId(Long accountId) {
this.accountId = accountId;
}
public String getNumber() { public String getNumber() {
return number; return number;
} }