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