From 582a42c9fc685a26254ffb50b4d4aeb1436125d2 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@63.com> Date: 星期五, 25 十一月 2022 16:29:24 +0800 Subject: [PATCH] # --- src/main/java/com/zy/crm/manager/controller/PlanController.java | 65 ++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 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 caa7561..8e66db5 100644 --- a/src/main/java/com/zy/crm/manager/controller/PlanController.java +++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java @@ -11,6 +11,7 @@ import com.core.common.R; import com.core.domain.KeyValueVo; import com.core.exception.CoolException; +import com.zy.crm.common.model.SettleDto; import com.zy.crm.common.web.BaseController; import com.zy.crm.manager.controller.result.FollowerTableVo; import com.zy.crm.manager.entity.Plan; @@ -20,6 +21,7 @@ import com.zy.crm.manager.service.PlanService; import com.zy.crm.manager.service.PlanTypeService; import com.zy.crm.system.entity.User; +import com.zy.crm.system.service.DeptService; import com.zy.crm.system.service.UserService; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.DataFormatter; @@ -43,6 +45,8 @@ private PlanService planService; @Autowired private PlanTypeService planTypeService; + @Autowired + private DeptService deptService; @GetMapping(value = "/plan/{id}/auth") @ManagerAuth @@ -59,6 +63,9 @@ return R.error("褰撳墠瑙勫垝鍗曠被鍨嬪凡琚鐢�"); } resultObj.put("formHtml", planType.getHtml()); + // 姝ラ鏉$浉鍏� + resultObj.put("step", plan.getSettle() == 5 ? 0 : plan.getSettle() + 1); + return R.ok().add(resultObj); } @@ -87,6 +94,7 @@ @RequestMapping(value = "/plan/add/auth") @ManagerAuth + @Transactional public R add(@RequestParam Map<String, Object> param) { // pre Plan plan = JSON.parseObject(JSON.toJSONString(param), Plan.class); @@ -115,10 +123,21 @@ plan.setForm(JSON.toJSONString(param)); // 鑷畾涔夎〃鍗曞唴瀹� plan.setSettle(1); // 1.寮�濮� + User manager = userService.getDeptManager(hostId, getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗 + plan.setSettleMsg(JSON.toJSONString(SettleDto.init(plan, manager))); if (!planService.insert(plan)) { throw new CoolException("淇濇寔澶辫触锛岃閲嶈瘯"); } + + // 鑷姩娣诲姞璺熻繘浜� + PlanFoll planFoll = new PlanFoll(); + planFoll.setPlanId(plan.getId()); + planFoll.setUserId(manager.getId()); + if (!planFollService.insert(planFoll)) { + throw new CoolException("淇濇寔澶辫触锛岃閲嶈瘯"); + } + return R.ok(); } @@ -151,6 +170,52 @@ return R.ok(); } + @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: + // 鏈粍缁勯暱瀹℃牳 + 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(2); // 瑙勫垝缁勯暱寰呭 + plan.setUpdateBy(getUserId()); + plan.setUpdateTime(new Date()); + + if (!planService.updateById(plan)) { + throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠$悊鍛�"); + } + + // 娣诲姞瑙勫垝缁勯暱璺熻繘浜� + + } else { + return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄�"); + } + break; + case 2: + break; + case 3: + break; + case 4: + break; + default: + return R.error(); + } + + + return R.ok(); + } + @RequestMapping(value = "/planQuery/auth") @ManagerAuth public R query(String condition) { -- Gitblit v1.9.1