From 538876b6ab77736bfbf9fe15c1fbbd2b22c24ff4 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@63.com> Date: 星期五, 25 十一月 2022 16:28:39 +0800 Subject: [PATCH] # --- src/main/java/com/zy/crm/manager/controller/PlanController.java | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 40 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/crm/manager/controller/PlanController.java b/src/main/java/com/zy/crm/manager/controller/PlanController.java index dfd6ef7..01bf282 100644 --- a/src/main/java/com/zy/crm/manager/controller/PlanController.java +++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java @@ -154,8 +154,6 @@ plan.setUpdateTime(new Date()); plan.setForm(JSON.toJSONString(param)); // 鑷畾涔夎〃鍗曞唴瀹� - User manager = userService.getDeptManager(getHostId(), getUser().getDeptId()); - plan.setSettleMsg(JSON.toJSONString(SettleDto.init(plan, manager))); if (!planService.updateById(plan)) { throw new CoolException("淇濇寔澶辫触锛岃閲嶈瘯"); @@ -175,6 +173,46 @@ @PostMapping(value = "/plan/approval/auth") @ManagerAuth public R approval(@RequestParam Long planId){ + Plan plan = planService.selectById(planId); + assert plan != null; + + switch (plan.getSettle()) { + case 1: + break; + case 2: + // 鏈粍缁勯暱瀹℃牳 + User user = userService.selectById(plan.getUserId()); + User manager = userService.getDeptManager(getHostId(), user.getDeptId()); + if (manager.getId().equals(getUserId())) { + + // 鏌ユ壘瑙勫垝缁勯暱 + plan.setSettleMsg(JSON.toJSONString(SettleDto.init(plan, manager))); + // 淇敼 settle 姝ラ鏁版嵁 + + // 淇敼瑙勫垝鍗曠姸鎬� + plan.setSettle(3); // 瑙勫垝缁勯暱寰呭 + plan.setUpdateBy(getUserId()); + plan.setUpdateTime(new Date()); + + if (!planService.updateById(plan)) { + throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠$悊鍛�"); + } + + // 娣诲姞瑙勫垝缁勯暱璺熻繘浜� + + } else { + return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄�"); + } + break; + case 3: + break; + case 4: + break; + default: + return R.error(); + } + + return R.ok(); } -- Gitblit v1.9.1