diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java index fdd6736..17b3c2b 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -94,8 +94,7 @@ public class ProjectController extends BaseController{ * 预算保存草稿 */ @RequestMapping("/estimateAddSave") - public String estimateAddSave(Project project, EstimateBean estimateBean, - Map<String, Object> model) { + public String estimateAddSave(Project project, EstimateBean estimateBean, Map<String, Object> model) { projectService.estimateAddSave(project, estimateBean, InterfaceUtil.getAdmin(), ApproveStatusEnum.APPROVAL_UNCOMMIT); return "redirect:/project/list"; } @@ -104,8 +103,7 @@ public class ProjectController extends BaseController{ * 预算保存并提交审核 */ @RequestMapping("/estimateAddSaveAndApprove") - public String estimateAddSaveAndApprove(Project project, EstimateBean estimateBean, - Map<String, Object> model) { + public String estimateAddSaveAndApprove(Project project, EstimateBean estimateBean, Map<String, Object> model) { projectService.estimateAddSave(project, estimateBean, InterfaceUtil.getAdmin(), ApproveStatusEnum.APPROVAL_PENDING); //TODO 发起审核 return "redirect:/project/list"; @@ -121,15 +119,13 @@ public class ProjectController extends BaseController{ return "admin/project_estimate_edit"; } @RequestMapping("/estimateEditSave") - public String estimateEditSave(Project project, EstimateBean estimateBean, - Map<String, Object> model) { + public String estimateEditSave(Project project, EstimateBean estimateBean, Map<String, Object> model) { projectService.estimateEditSave(project, estimateBean, InterfaceUtil.getAdmin(), ApproveStatusEnum.APPROVAL_UNCOMMIT); return "redirect:/project/list"; } @RequestMapping("/estimateEditSaveAndApprove") - public String estimateEditSaveAndApprove(Project project, EstimateBean estimateBean, - Map<String, Object> model) { + public String estimateEditSaveAndApprove(Project project, EstimateBean estimateBean, Map<String, Object> model) { projectService.estimateEditSave(project, estimateBean, InterfaceUtil.getAdmin(), ApproveStatusEnum.APPROVAL_PENDING); //TODO 发起审核 return "redirect:/project/list"; @@ -154,8 +150,7 @@ public class ProjectController extends BaseController{ * 进行项目预算保存 */ @RequestMapping("/budgetEditSave") - public String budgetEditSave(Project project, BudgetBean budgetBean, - Map<String, Object> model) { + public String budgetEditSave(Project project, BudgetBean budgetBean, Map<String, Object> model) { projectService.budgetEditSave(project, budgetBean, InterfaceUtil.getAdmin(), ApproveStatusEnum.APPROVAL_UNCOMMIT); return "redirect:/project/list"; } @@ -163,8 +158,7 @@ public class ProjectController extends BaseController{ * 进行项目预算保存并提交审核 */ @RequestMapping("/budgetEditSaveAndApprove") - public String budgetEditSaveAndApprove(Project project, BudgetBean budgetBean, - Map<String, Object> model) { + public String budgetEditSaveAndApprove(Project project, BudgetBean budgetBean, Map<String, Object> model) { projectService.budgetEditSave(project, budgetBean, InterfaceUtil.getAdmin(), ApproveStatusEnum.APPROVAL_PENDING); return "redirect:/project/list"; } diff --git a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java index 43722ca..c0edc64 100644 --- a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java +++ b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java @@ -144,6 +144,9 @@ public class ProjectBudgetService { } + /** + * 其实最好是通过明细表生成,不然可能有数据不一致的情况 + */ public BudgetBean getBudget(Project project) { BudgetBean budgetBean = new BudgetBean();