From 02b009c3b479a33451efde4a3b1598c72fb9a559 Mon Sep 17 00:00:00 2001 From: Harry Yang Date: Wed, 4 Jan 2023 19:20:48 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=AE=97=E6=AF=9B=E5=88=A9=E7=8E=87?= =?UTF-8?q?=20=E7=94=B3=E8=AF=B7=E4=BA=BA=E9=A2=86=E5=AF=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../palmte/work/controller/backend/ProcessController.java | 8 +++++--- .../java/cn/palmte/work/model/process/ProjectProcess.java | 4 ++-- .../palmte/work/model/process/ProjectProcessDetail.java | 1 + .../work/model/process/form/ProcessCreationForm.java | 4 ++-- .../resources/templates/admin/business/process-detail.ftl | 8 +++++--- 5 files changed, 15 insertions(+), 10 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 06c277c..6e8f5f8 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java @@ -190,7 +190,7 @@ public class ProcessController { List attachments = JSONArray.parseArray(process.getAttachmentUri(), ProcessAttachment.class); model.addAttribute("attachments", attachments); model.addAttribute("isPrepaid", isPrepaid(project)); - BigDecimal repaidAmount = getRepaidAmount(id); + BigDecimal repaidAmount = getRepaidAmount(process.getProjectId()); model.addAttribute("repaidAmount", repaidAmount); model.addAttribute("forAudit", forAudit); @@ -349,11 +349,13 @@ public class ProcessController { detail.setProcessId(id); detail.setProcess(process); - Project project = projectRepository.findById(process.getProjectId()); + BudgetBean budgetBean = projectBudgetService.getBudget(project); + detail.setProject(project); - BigDecimal repaidAmount = getRepaidAmount(id); + BigDecimal repaidAmount = getRepaidAmount(process.getProjectId()); detail.setRepaidAmount(repaidAmount); + detail.setBudgetGrossMargin(budgetBean.getProjectGrossProfitRate()); Object contract = null; List supplierMaterials = Collections.emptyList(); diff --git a/src/main/java/cn/palmte/work/model/process/ProjectProcess.java b/src/main/java/cn/palmte/work/model/process/ProjectProcess.java index ab3c84a..b330ff7 100644 --- a/src/main/java/cn/palmte/work/model/process/ProjectProcess.java +++ b/src/main/java/cn/palmte/work/model/process/ProjectProcess.java @@ -66,10 +66,10 @@ public class ProjectProcess implements Serializable { // 申请部门ID(逗号分割) private String applyDeptId; - // 申请部门领导ID + // 申请人部门领导ID private Integer applyDeptLeaderId; - // 申请部门领导 + // 申请人部门领导 private String applyDeptLeaderName; // 合同编号 diff --git a/src/main/java/cn/palmte/work/model/process/ProjectProcessDetail.java b/src/main/java/cn/palmte/work/model/process/ProjectProcessDetail.java index 3e61c8c..37ed4e3 100644 --- a/src/main/java/cn/palmte/work/model/process/ProjectProcessDetail.java +++ b/src/main/java/cn/palmte/work/model/process/ProjectProcessDetail.java @@ -32,6 +32,7 @@ public class ProjectProcessDetail { private String isPrepaid; private BigDecimal repaidAmount; + private BigDecimal budgetGrossMargin; private Object contract; diff --git a/src/main/java/cn/palmte/work/model/process/form/ProcessCreationForm.java b/src/main/java/cn/palmte/work/model/process/form/ProcessCreationForm.java index 1cd3a5e..a55a06f 100644 --- a/src/main/java/cn/palmte/work/model/process/form/ProcessCreationForm.java +++ b/src/main/java/cn/palmte/work/model/process/form/ProcessCreationForm.java @@ -44,10 +44,10 @@ public class ProcessCreationForm { // 申请部门ID(逗号分割) private String applyDeptId; - // 申请部门领导ID + // 申请人部门领导ID private Integer applyDeptLeaderId; - // 申请部门领导 + // 申请人部门领导 private String applyDeptLeaderName; // 申请人电话 diff --git a/src/main/resources/templates/admin/business/process-detail.ftl b/src/main/resources/templates/admin/business/process-detail.ftl index 73b2bb0..c7fb3ee 100644 --- a/src/main/resources/templates/admin/business/process-detail.ftl +++ b/src/main/resources/templates/admin/business/process-detail.ftl @@ -61,7 +61,7 @@ {{process?.applyDept?.split(',').join('/')}} {{process.applyPersonName}} - {{process.applyDeptLeaderName}} + {{process.applyDeptLeaderName}} {{contract.applyPersonPhone}} @@ -94,9 +94,9 @@ {{process.taxRate}}% ${isPrepaid} - ${repaidAmount}元 + ${repaidAmount}元 - ${project.grossProfitMargin} + {{budgetGrossMargin}}% @@ -320,6 +320,7 @@ .then(parseJSON) .then(data => { const { + budgetGrossMargin, attachments, processId, isPrepaid, repaidAmount, incomeDetails, process, projectType, cooperationType, contract, supplierMaterials, procurementDetails, project @@ -361,6 +362,7 @@ this.processId = processId this.projectType = projectType this.cooperationType = cooperationType + this.budgetGrossMargin = budgetGrossMargin this.supplierMaterials = supplierMaterials && supplierMaterials.map(item => ({ ...item, attachment: mapAttachment(item.attachment) }))