From e960d0d4ff14486f786e1601296a9be9cb3ce207 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 28 十一月 2022 13:29:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/PlanController.java | 62 +++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 4 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 8e66db5..b66b0f3 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -8,6 +8,7 @@
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
import com.core.domain.KeyValueVo;
import com.core.exception.CoolException;
@@ -172,7 +173,8 @@
@PostMapping(value = "/plan/approval/auth")
@ManagerAuth
- public R approval(@RequestParam Long planId){
+ public R approval(@RequestParam Long planId,
+ @RequestParam(required = false) Long planner){
Plan plan = planService.selectById(planId);
assert plan != null;
@@ -184,8 +186,33 @@
if (manager.getId().equals(getUserId())) {
// 鏌ユ壘瑙勫垝缁勯暱
- plan.setSettleMsg(JSON.toJSONString(SettleDto.init(plan, manager)));
+ PlanType planType = planTypeService.selectById(plan.getPlanType());
+ User planLeader = planTypeService.findPlanLeader(planType);
+ if (Cools.isEmpty(planLeader)) {
+ throw new CoolException("鏈煡鎵惧埌瑙勫垝缁勯暱锛岃鑱旂郴绠＄悊鍛�");
+ }
+
// 淇敼 settle 姝ラ鏁版嵁
+ List<SettleDto> list = JSON.parseArray(plan.getSettleMsg(), SettleDto.class);
+ for (SettleDto dto : list) {
+ switch (dto.getStep()) {
+ case 1:
+ dto.setCurr(Boolean.FALSE);
+ break;
+ case 2:
+ dto.setCurr(Boolean.TRUE);
+ dto.setMsg("鏈粍缁勯暱" + manager.getNickname() + "瀹℃壒閫氳繃");
+ dto.setTime(DateUtils.convert(new Date()));
+ break;
+ case 3:
+ dto.setUserId(planLeader.getId());
+ dto.setUsername(planLeader.getNickname());
+ break;
+ default:
+ break;
+ }
+ }
+ plan.setSettleMsg(JSON.toJSONString(list));
// 淇敼瑙勫垝鍗曠姸鎬�
plan.setSettle(2); // 瑙勫垝缁勯暱寰呭
@@ -197,6 +224,12 @@
}
// 娣诲姞瑙勫垝缁勯暱璺熻繘浜�
+ PlanFoll planFoll = new PlanFoll();
+ planFoll.setPlanId(plan.getId());
+ planFoll.setUserId(planLeader.getId());
+ if (!planFollService.insert(planFoll)) {
+ throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
} else {
return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄�");
@@ -211,11 +244,32 @@
default:
return R.error();
}
-
-
return R.ok();
}
+ @PostMapping(value = "/plan/planner/list/auth")
+ @ManagerAuth
+ public R plannerList(@RequestParam Long planId){
+ Plan plan = planService.selectById(planId);
+ assert plan != null;
+
+ if (plan.getSettle() != 2) {
+ return R.error();
+ }
+ // 鏌ユ壘瑙勫垝缁勯暱
+ PlanType planType = planTypeService.selectById(plan.getPlanType());
+ User planLeader = planTypeService.findPlanLeader(planType);
+ if (Cools.isEmpty(planLeader)) {
+ throw new CoolException("鏈煡鎵惧埌瑙勫垝缁勯暱锛岃鑱旂郴绠＄悊鍛�");
+ }
+ if (!getUserId().equals(planLeader.getId())) {
+ return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄�");
+ }
+ // 鑾峰彇褰撴湡瑙勫垝缁勬墍鏈夋垚鍛�
+ List<User> users = userService.selectList(new EntityWrapper<User>().eq("dept_id", planLeader.getDeptId()));
+ return R.ok().add(users);
+ }
+
@RequestMapping(value = "/planQuery/auth")
@ManagerAuth
public R query(String condition) {
--
Gitblit v1.9.1