From 3de9c5afdb98d6035a421a61b401fc1ab68147f7 Mon Sep 17 00:00:00 2001 From: xxssyyyyssxx Date: Wed, 1 Dec 2021 16:38:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=9C=B0=E6=96=B9=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E6=89=93=E5=8D=B0=E4=B8=8D=E5=87=BA=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../palmte/work/config/log/WebLogAspect.java | 8 +-- .../controller/backend/ProjectController.java | 71 ++++++++++--------- 2 files changed, 39 insertions(+), 40 deletions(-) diff --git a/src/main/java/cn/palmte/work/config/log/WebLogAspect.java b/src/main/java/cn/palmte/work/config/log/WebLogAspect.java index dabbf4c..11f7272 100644 --- a/src/main/java/cn/palmte/work/config/log/WebLogAspect.java +++ b/src/main/java/cn/palmte/work/config/log/WebLogAspect.java @@ -45,13 +45,7 @@ public class WebLogAspect { +(proceedingJoinPoint.getSignature().getDeclaringTypeName() + "." + proceedingJoinPoint.getSignature().getName() + " : ") + Arrays.toString(proceedingJoinPoint.getArgs())); - Object proceed = null; - try { - proceed = proceedingJoinPoint.proceed(); - } catch (Throwable throwable) { - logger.error(throwable.getMessage(), throwable); - throw new RuntimeException(throwable); - } + Object proceed = proceedingJoinPoint.proceed(); logger.info("RESPONSE : " + proceed); return proceed; 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 758ea66..44ff369 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -171,39 +171,44 @@ public class ProjectController extends BaseController { */ @RequestMapping("/budgetEdit") public String budget(@RequestParam("id") int id, Map model) { - Project project = projectService.getProject(id); - model.put("project", project); - //采购类型 - model.put("procurementTypes", procurementTypeService.allProcurementTypeList()); - BudgetBean budgetBean = projectBudgetService.getBudget(project); - //预算主页面数据 - model.put("budgetBean", budgetBean); - //收入明细 - List budgetIncomeDetail = projectBudgetService.getBudgetIncomeDetail(project); - model.put("incomeDetails", budgetIncomeDetail); - //成本明细 - List budgetCostDetail = projectBudgetService.getBudgetCostDetail(project); - model.put("costDetails", budgetCostDetail); - //项目管理成本明细 - List budgetCostProjectManageDetail = projectBudgetService.getBudgetCostProjectManageDetail(project); - model.put("costProjectManageDetails", budgetCostProjectManageDetail); - List projectBudgetPlanDetails = projectBudgetService.getProjectBudgetPlanDetails(project); - //资金计划明细 - model.put("projectBudgetPlanDetails", projectBudgetPlanDetails); - //资金计划总【上面汇总表第一行】 - model.put("projectBudgetPlanDetailTotalTitle", projectBudgetService.getProjectBudgetPlanDetailTotalTitle(project, - budgetIncomeDetail, - budgetCostDetail, - budgetCostProjectManageDetail, - projectBudgetPlanDetails)); - //资金计划总【上面汇总表第二行】 - model.put("projectBudgetPlanDetailTotal", projectBudgetService.getProjectBudgetPlanDetailTotal(project, projectBudgetPlanDetails)); - //资金计划表中的统计信息【下面资金小表】 - model.put("underwrittenPlanStatistic", projectBudgetService.getProjectUnderwrittenPlanStatisticBean(projectBudgetPlanDetails)); - //现金表 - model.put("cashFlowBean", projectBudgetService.getCashFlowBean(project, projectBudgetPlanDetails)); - //freemarker可以利用的静态方法 - model.put("Utils", FreeMarkerUtil.fromStaticPackage("cn.palmte.work.utils.Utils")); + try { + Project project = projectService.getProject(id); + model.put("project", project); + //采购类型 + model.put("procurementTypes", procurementTypeService.allProcurementTypeList()); + BudgetBean budgetBean = projectBudgetService.getBudget(project); + //预算主页面数据 + model.put("budgetBean", budgetBean); + //收入明细 + List budgetIncomeDetail = projectBudgetService.getBudgetIncomeDetail(project); + model.put("incomeDetails", budgetIncomeDetail); + //成本明细 + List budgetCostDetail = projectBudgetService.getBudgetCostDetail(project); + model.put("costDetails", budgetCostDetail); + //项目管理成本明细 + List budgetCostProjectManageDetail = projectBudgetService.getBudgetCostProjectManageDetail(project); + model.put("costProjectManageDetails", budgetCostProjectManageDetail); + List projectBudgetPlanDetails = projectBudgetService.getProjectBudgetPlanDetails(project); + //资金计划明细 + model.put("projectBudgetPlanDetails", projectBudgetPlanDetails); + //资金计划总【上面汇总表第一行】 + model.put("projectBudgetPlanDetailTotalTitle", projectBudgetService.getProjectBudgetPlanDetailTotalTitle(project, + budgetIncomeDetail, + budgetCostDetail, + budgetCostProjectManageDetail, + projectBudgetPlanDetails)); + //资金计划总【上面汇总表第二行】 + model.put("projectBudgetPlanDetailTotal", projectBudgetService.getProjectBudgetPlanDetailTotal(project, projectBudgetPlanDetails)); + //资金计划表中的统计信息【下面资金小表】 + model.put("underwrittenPlanStatistic", projectBudgetService.getProjectUnderwrittenPlanStatisticBean(projectBudgetPlanDetails)); + //现金表 + model.put("cashFlowBean", projectBudgetService.getCashFlowBean(project, projectBudgetPlanDetails)); + //freemarker可以利用的静态方法 + model.put("Utils", FreeMarkerUtil.fromStaticPackage("cn.palmte.work.utils.Utils")); + } catch (Exception e) { + logger.error(e.getMessage(), e); + throw e; + } return "admin/project_budget_edit"; }