diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/AccountController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/AccountController.java index 996454c0..c2821c0e 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/AccountController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/AccountController.java @@ -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); } } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/AccountVo4InOutList.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/AccountVo4InOutList.java index dbeba8b6..5da3dd4f 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/AccountVo4InOutList.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/AccountVo4InOutList.java @@ -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; }