From ce8037ec584ec139831ffdb35d1c438ade77779d 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, 22 Sep 2017 23:10:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E4=B8=AD=E7=9A=84=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E8=B4=A6=E6=88=B7=E7=9A=84=E6=9F=A5=E7=9C=8Bbug?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jsh/action/basic/AccountAction.java | 5 ++++- .../java/com/jsh/action/materials/DepotHeadAction.java | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/jsh/action/basic/AccountAction.java b/src/main/java/com/jsh/action/basic/AccountAction.java index 747cb4d1..80203fce 100644 --- a/src/main/java/com/jsh/action/basic/AccountAction.java +++ b/src/main/java/com/jsh/action/basic/AccountAction.java @@ -305,7 +305,10 @@ public class AccountAction extends BaseAction item.put("initialAmount", account.getInitialAmount()); String monthTime = Tools.getCurrentMonth(); Double thisMonthAmount = getAccountSum(account.getId(), monthTime) + getAccountSumByHead(account.getId(), monthTime) +getAccountSumByDetail(account.getId(), monthTime); - String thisMonthAmountFmt=df.format(thisMonthAmount); + String thisMonthAmountFmt = "0"; + if(thisMonthAmount!=0){ + thisMonthAmountFmt = df.format(thisMonthAmount); + } item.put("thisMonthAmount", thisMonthAmountFmt); //本月发生额 Double currentAmount = getAccountSum(account.getId(),"") + getAccountSumByHead(account.getId(), "") + getAccountSumByDetail(account.getId(), "") + account.getInitialAmount(); String currentAmountFmt=df.format(currentAmount); diff --git a/src/main/java/com/jsh/action/materials/DepotHeadAction.java b/src/main/java/com/jsh/action/materials/DepotHeadAction.java index f5786a1b..737f38b4 100644 --- a/src/main/java/com/jsh/action/materials/DepotHeadAction.java +++ b/src/main/java/com/jsh/action/materials/DepotHeadAction.java @@ -194,7 +194,12 @@ public class DepotHeadAction extends BaseAction if(model.getOrganId()!=null){depotHead.setOrganId(new Supplier(model.getOrganId()));} if(model.getHandsPersonId()!=null){depotHead.setHandsPersonId(new Person(model.getHandsPersonId()));} depotHead.setSalesman(model.getSalesman()); - if(model.getAccountId()!=null){depotHead.setAccountId(new Account(model.getAccountId()));} + if(model.getAccountId()!=null){ + depotHead.setAccountId(new Account(model.getAccountId())); + } + else { + depotHead.setAccountId(null); + } depotHead.setChangeAmount(model.getChangeAmount()); depotHead.setAccountIdList(model.getAccountIdList()); depotHead.setAccountMoneyList(model.getAccountMoneyList());