From da9c31762ac8497ed0f955fcd3965ba6b301c4ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 30 Apr 2021 00:16:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=B4=A6=E6=88=B7=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=8A=A5=E8=A1=A8=E5=B1=95=E7=A4=BA=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jsh/erp/controller/AccountController.java |  1 +
 .../com/jsh/erp/datasource/vo/AccountVo4InOutList.java | 10 ++++++++++
 2 files changed, 11 insertions(+)

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;
     }