diff --git a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java index ac551e4..8921c10 100644 --- a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java +++ b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java @@ -904,6 +904,13 @@ public class ProjectBudgetService { @Transactional(rollbackFor = RuntimeException.class) public Project budgetEditSave(Project project, Project p, BudgetBean budgetBean, Admin admin, ApproveStatusEnum approveStatusEnum) { // Project p = projectService.estimateEditProject(project, projectInDb); + p.setOtherName(project.getOtherName()); + + p.setPlanStartStr(project.getPlanStartStr()); + p.setPlanEndStr(project.getPlanEndStr()); + /// projectInDb.setApproveStatusEstimate(approveStatusEnum.getApproveStatus()); + + p.setLastUpdateTime(new Date()); p.setStatus(StatusEnum.BUDGET_ACCOUNTS.getStatus()); p.setStatusDesc(StatusEnum.BUDGET_ACCOUNTS.getStatusDesc()); p.setApproveStatusBudget(approveStatusEnum.getApproveStatus()); diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index cf7af25..c21690a 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -470,7 +470,7 @@ value="${incomeDetail.unit!}"> + value="${Utils.format(incomeDetail.amount,'0.00')}"> @@ -502,7 +502,7 @@ - > + > @@ -649,7 +649,7 @@ value="${costDetail.unit!}"> + value="${Utils.format(costDetail.amount,'0.00')}"> @@ -711,7 +711,7 @@ - > + > @@ -795,6 +795,8 @@ 业务费用 <#elseif costProjectManageDetail.type ==3> 其他费用 + <#elseif costProjectManageDetail.type ==4> + 保证金 + value="${Utils.format(costProjectManageDetail.amount,'0.00')}"> @@ -847,7 +849,7 @@ - > + >