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 1104a00..f960345 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java @@ -296,7 +296,7 @@ public class ProcessController { public String isPrepaid; // 垫资金额 - public String repaidAmount; + public BigDecimal repaidAmount; // 预算毛利率 public BigDecimal budgetGrossMargin; @@ -340,7 +340,7 @@ public class ProcessController { .incomeDetails(incomeDetails) .procurementDetails(procurementDetails) .projectName(project.getName()) - .repaidAmount(repaidAmount + "元") + .repaidAmount(repaidAmount) .budgetGrossMargin(budgetBean.getProjectGrossProfitRate()) .projectNo(project.getProjectNo()) .applyPersonName(admin.getRealName()) diff --git a/src/main/resources/templates/admin/business/process-new.ftl b/src/main/resources/templates/admin/business/process-new.ftl index ee0069c..06e0462 100644 --- a/src/main/resources/templates/admin/business/process-new.ftl +++ b/src/main/resources/templates/admin/business/process-new.ftl @@ -305,7 +305,7 @@ - {{processForm.repaidAmount|numberFormat}} + {{processForm.repaidAmount|numberFormat}}元 未选择项目