From 4795b8ec5c363b7ee80d0994f6998f0ba701a71c Mon Sep 17 00:00:00 2001 From: Harry Yang Date: Fri, 23 Dec 2022 11:50:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9E=AB=E8=B5=84=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../work/controller/backend/ProcessController.java | 14 +++++++++++++- .../templates/admin/business/process-detail.ftl | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) 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 3c8764d..dd548b9 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java @@ -151,6 +151,8 @@ public class ProcessController { List attachments = JSONArray.parseArray(process.getAttachmentUri(), ProcessAttachment.class); model.addAttribute("attachments", attachments); model.addAttribute("isPrepaid", isPrepaid(project)); + BigDecimal repaidAmount = getRepaidAmount(id); + model.addAttribute("repaidAmount", repaidAmount); if (process.getProcessType() != null) { switch (process.getProcessType()) { @@ -178,6 +180,12 @@ public class ProcessController { return "/admin/business/process-detail"; } + private BigDecimal getRepaidAmount(int id) { + Map map = jdbcTemplate.queryForMap( + "select ifnull(sum(underwritten_plan), 0) repaidAmount from project_budget_plan_detail where project_id = ?", id); + return (BigDecimal) map.values().iterator().next(); + } + @ResponseBody @GetMapping("/projects") public List> query(@RequestParam String q) { @@ -220,7 +228,7 @@ public class ProcessController { public String isPrepaid; // 垫资金额 - public final String repaidAmount = "50000元"; + public String repaidAmount; // 预算毛利率 public BigDecimal budgetGrossMargin; @@ -232,6 +240,9 @@ public class ProcessController { Project project = projectRepository.findById(id); Admin admin = InterfaceUtil.getAdmin(); + // project_budget_plan_detail 垫资金额计算 + + BigDecimal repaidAmount = getRepaidAmount(id); // 可以在对应表数据查询 是否存在再启用 List incomeDetails = projectBudgetService.getBudgetIncomeDetail(project); return ProjectReturnValue.builder() @@ -239,6 +250,7 @@ public class ProcessController { .projectId(project.getId()) .incomeDetails(incomeDetails) .projectName(project.getName()) + .repaidAmount(repaidAmount + "元") .budgetGrossMargin(project.getGrossProfitMargin()) .projectNo(project.getProjectNo()) .applyPersonName(admin.getRealName()) diff --git a/src/main/resources/templates/admin/business/process-detail.ftl b/src/main/resources/templates/admin/business/process-detail.ftl index 20aff40..3479345 100644 --- a/src/main/resources/templates/admin/business/process-detail.ftl +++ b/src/main/resources/templates/admin/business/process-detail.ftl @@ -139,7 +139,7 @@ - ${project.repaidAmount} + ${repaidAmount}元