From 9093fab19458f23e36d7645fb4ef171ec9c92856 Mon Sep 17 00:00:00 2001 From: Harry Yang Date: Fri, 30 Dec 2022 16:22:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E4=BF=9D=E5=AD=98=20?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C=20=E5=B7=B2=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E6=95=B0=E9=87=8F=20=E6=9B=B4=E6=96=B0=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../palmte/work/controller/backend/ProcessController.java | 2 ++ .../java/cn/palmte/work/service/ProjectProcessService.java | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java index 16e99b7..555cd98 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java @@ -428,6 +428,8 @@ public class ProcessController { purchaseAmount.setAmount(amountForm.amount); purchaseAmount.setBudgetCostId(amountForm.budgetCostId); purchaseAmount.setAmountCurrent(amountForm.amountCurrent); + // 更新到数据库 + purchaseAmount.setAmountAlready(amountAlready); // TODO 提交模式才计算 剩余 if (form.getStatus() == ProcessStatus.to_be_audit) { diff --git a/src/main/java/cn/palmte/work/service/ProjectProcessService.java b/src/main/java/cn/palmte/work/service/ProjectProcessService.java index c6337ba..76ecb0c 100644 --- a/src/main/java/cn/palmte/work/service/ProjectProcessService.java +++ b/src/main/java/cn/palmte/work/service/ProjectProcessService.java @@ -221,7 +221,11 @@ public class ProjectProcessService { detail.setBudgetCostId(costDetail.getId()); detail.setCategory(getCategory(costDetail)); detail.setAmountLeft(amount.getAmountLeft()); - detail.setAmountAlready(amount.getAmountAlready()); + BigDecimal amountAlready = amount.getAmountAlready(); + if (amountAlready == null) { + amountAlready = getAmountAlready(amount.getBudgetCostId()); + } + detail.setAmountAlready(amountAlready); detail.setAmountCurrent(amount.getAmountCurrent()); ret.add(detail); }