mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

其他地方异常打印不出来

master
xxssyyyyssxx 2021-12-01 16:38:08 +08:00
parent 5472a418a2
commit 3de9c5afdb
2 changed files with 39 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/cn/palmte/work/config/log/WebLogAspect.java
View File

@ -45,13 +45,7 @@ public class WebLogAspect {
+(proceedingJoinPoint.getSignature().getDeclaringTypeName() + "." + proceedingJoinPoint.getSignature().getName() + " : ") +(proceedingJoinPoint.getSignature().getDeclaringTypeName() + "." + proceedingJoinPoint.getSignature().getName() + " : ")
+ Arrays.toString(proceedingJoinPoint.getArgs())); + Arrays.toString(proceedingJoinPoint.getArgs()));
Object proceed = null; Object proceed = proceedingJoinPoint.proceed();
try {
proceed = proceedingJoinPoint.proceed();
} catch (Throwable throwable) {
logger.error(throwable.getMessage(), throwable);
throw new RuntimeException(throwable);
}
logger.info("RESPONSE : " + proceed); logger.info("RESPONSE : " + proceed);
return proceed; return proceed;

71
src/main/java/cn/palmte/work/controller/backend/ProjectController.java
View File

@ -171,39 +171,44 @@ public class ProjectController extends BaseController {
*/ */
@RequestMapping("/budgetEdit") @RequestMapping("/budgetEdit")
public String budget(@RequestParam("id") int id, Map<String, Object> model) { public String budget(@RequestParam("id") int id, Map<String, Object> model) {
Project project = projectService.getProject(id); try {
model.put("project", project); Project project = projectService.getProject(id);
//采购类型 model.put("project", project);
model.put("procurementTypes", procurementTypeService.allProcurementTypeList()); //采购类型
BudgetBean budgetBean = projectBudgetService.getBudget(project); model.put("procurementTypes", procurementTypeService.allProcurementTypeList());
//预算主页面数据 BudgetBean budgetBean = projectBudgetService.getBudget(project);
model.put("budgetBean", budgetBean); //预算主页面数据
//收入明细 model.put("budgetBean", budgetBean);
List<ProjectBudgetIncomeDetail> budgetIncomeDetail = projectBudgetService.getBudgetIncomeDetail(project); //收入明细
model.put("incomeDetails", budgetIncomeDetail); List<ProjectBudgetIncomeDetail> budgetIncomeDetail = projectBudgetService.getBudgetIncomeDetail(project);
//成本明细 model.put("incomeDetails", budgetIncomeDetail);
List<ProjectBudgetCostDetail> budgetCostDetail = projectBudgetService.getBudgetCostDetail(project); //成本明细
model.put("costDetails", budgetCostDetail); List<ProjectBudgetCostDetail> budgetCostDetail = projectBudgetService.getBudgetCostDetail(project);
//项目管理成本明细 model.put("costDetails", budgetCostDetail);
List<ProjectBudgetCostProjectManageDetail> budgetCostProjectManageDetail = projectBudgetService.getBudgetCostProjectManageDetail(project); //项目管理成本明细
model.put("costProjectManageDetails", budgetCostProjectManageDetail); List<ProjectBudgetCostProjectManageDetail> budgetCostProjectManageDetail = projectBudgetService.getBudgetCostProjectManageDetail(project);
List<ProjectBudgetPlanDetail> projectBudgetPlanDetails = projectBudgetService.getProjectBudgetPlanDetails(project); model.put("costProjectManageDetails", budgetCostProjectManageDetail);
//资金计划明细 List<ProjectBudgetPlanDetail> projectBudgetPlanDetails = projectBudgetService.getProjectBudgetPlanDetails(project);
model.put("projectBudgetPlanDetails", projectBudgetPlanDetails); //资金计划明细
//资金计划总【上面汇总表第一行】 model.put("projectBudgetPlanDetails", projectBudgetPlanDetails);
model.put("projectBudgetPlanDetailTotalTitle", projectBudgetService.getProjectBudgetPlanDetailTotalTitle(project, //资金计划总【上面汇总表第一行】
budgetIncomeDetail, model.put("projectBudgetPlanDetailTotalTitle", projectBudgetService.getProjectBudgetPlanDetailTotalTitle(project,
budgetCostDetail, budgetIncomeDetail,
budgetCostProjectManageDetail, budgetCostDetail,
projectBudgetPlanDetails)); budgetCostProjectManageDetail,
//资金计划总【上面汇总表第二行】 projectBudgetPlanDetails));
model.put("projectBudgetPlanDetailTotal", projectBudgetService.getProjectBudgetPlanDetailTotal(project, projectBudgetPlanDetails)); //资金计划总【上面汇总表第二行】
//资金计划表中的统计信息【下面资金小表】 model.put("projectBudgetPlanDetailTotal", projectBudgetService.getProjectBudgetPlanDetailTotal(project, projectBudgetPlanDetails));
model.put("underwrittenPlanStatistic", projectBudgetService.getProjectUnderwrittenPlanStatisticBean(projectBudgetPlanDetails)); //资金计划表中的统计信息【下面资金小表】
//现金表 model.put("underwrittenPlanStatistic", projectBudgetService.getProjectUnderwrittenPlanStatisticBean(projectBudgetPlanDetails));
model.put("cashFlowBean", projectBudgetService.getCashFlowBean(project, projectBudgetPlanDetails)); //现金表
//freemarker可以利用的静态方法 model.put("cashFlowBean", projectBudgetService.getCashFlowBean(project, projectBudgetPlanDetails));
model.put("Utils", FreeMarkerUtil.fromStaticPackage("cn.palmte.work.utils.Utils")); //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"; return "admin/project_budget_edit";
} }