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 baacde2..f68cae7 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -997,7 +997,26 @@ public class ProjectController extends BaseController { // projectService.saveApprove(project, InterfaceUtil.getAdmin()); // // return ResponseMsg.buildSuccessMsg("提交成功"); - return ResponseMsg.buildFailedMsg("请到编辑页面提交审核"); + return ResponseMsg.buildFailedMsg("即将跳转详情页确认提交内容,请在确认后再提交"); + } + + /** + * 提交审核跳转编辑页面,根据状态区分去哪个页面 + */ + @RequestMapping("/toEditAllStatus") + @ResponseBody + public String toEditAllStatus(int id) throws Exception { + Project project = projectRepository.findOne(id); + if (project.getStatus() == Project.STATUS_ESTIMATE) { + return "redirect:/project/edit?id=" + id; + } else if (project.getStatus() == Project.STATUS_BUDGET) { + return "redirect:/project/budget?id=" + id; + } else if (project.getStatus() == Project.STATUS_SETTLE) { + return "redirect:/project/settle/edit?id=" + id; + } else if (project.getStatus() == Project.STATUS_FINAL) { + return "redirect:/project/final/edit?id=" + id; + } + return "redirect:/project/list"; } /** diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl index fefca51..528fe45 100644 --- a/src/main/resources/templates/admin/project_list.ftl +++ b/src/main/resources/templates/admin/project_list.ftl @@ -495,7 +495,7 @@ <#if (list.creatorId==adminId && list.approveStatusEstimate == 0) || (list.creatorId==adminId && list.approveStatusBudget == 0) || (admin.getRoleLevel() = 6 && list.approveStatusSettle == 0 && list.approveStatusBudget == 2) || ((admin.getRoleLevel() = 2 || admin.getRoleLevel() = 6) && list.approveStatusFinal == 0)> @@ -703,22 +703,34 @@