diff --git a/src/main/java/cn/palmte/work/service/ProjectEstimateService.java b/src/main/java/cn/palmte/work/service/ProjectEstimateService.java index 46580e2..8431cc5 100644 --- a/src/main/java/cn/palmte/work/service/ProjectEstimateService.java +++ b/src/main/java/cn/palmte/work/service/ProjectEstimateService.java @@ -264,7 +264,7 @@ public class ProjectEstimateService { estimateApprove(approveStatusEstimate, projectInDb, admin); } - public void estimateApprove(Integer approveStatusEstimate, Project projectInDb, Admin admin) { + public void estimateApprove(Integer approveStatusEstimate, Project projectInDb, Admin admin) throws Exception { if(null != approveStatusEstimate && ApproveStatusEnum.APPROVAL_UNPASS.getApproveStatus() == approveStatusEstimate){ //审核不通过的情况下重新编辑后就完成当前任务【此时任务节点在第一个,也就是发起审批】 diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index b78f971..a279b1c 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -199,20 +199,20 @@
-
-
*垫资利息
-
- ${Utils.format(project.advanceInterestAmount)}元 -
-
-
-
-
*垫资峰值
-
- ${Utils.format(project.advancePeakAmount)}元 -
-
-
+<#--
--> +<#--
*垫资利息
--> +<#--
--> +<#-- ${Utils.format(project.advanceInterestAmount)}元--> +<#--
--> +<#--
--> +<#--
--> +<#--
--> +<#--
*垫资峰值
--> +<#--
--> +<#-- ${Utils.format(project.advancePeakAmount)}元--> +<#--
--> +<#--
--> +<#--
-->
*合同金额