From bd5ab921857b0871f7b7f5b96408dae7239c13a0 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 02 十一月 2023 13:25:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/PlanController.java | 58 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 44 insertions(+), 14 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 30617da..08a2175 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -55,6 +55,11 @@
private OrderService orderService;
@Autowired
private SmsCodeService smsCodeService;
+ @Autowired
+ private ProcessPermissionsService processPermissionsService;
+
+ String PZH=" 鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�� ";
+
@GetMapping(value = "/plan/{id}/auth")
@ManagerAuth
@@ -84,10 +89,22 @@
@RequestParam(required = false) String condition,
@RequestParam(required = false, value = "dept_id") Long deptId,
@RequestParam(required = false, value = "user_id") Long userId) {
+ Long director = null;
+ if (deptId==null && userId == null){
+ if (getRole().getId()==3){
+ userId = getUserId();
+ }else if (getRole().getId()==2){
+ deptId = getDeptId();
+ userId = null;
+ }
+ director = getUserId();
+ }
+
return R.ok(planService.getPage(new Page<>(curr, limit)
, getHostId()
, deptId == null ? null : String.valueOf(deptId)
- , userId == null ? getUserId() : userId
+ , userId
+ , director
, condition)
);
}
@@ -434,7 +451,7 @@
if (Cools.isEmpty(dto.getMsg())){
dto.setMsg("鍞墠缁勯暱" + planLeader.getNickname() + "瀹℃壒閫氳繃");
}else {
- dto.setMsg(dto.getMsg()+" 鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�� "+DateUtils.convert(new Date())+" "+"鍞墠缁勯暱" + planLeader.getNickname() + "瀹℃壒閫氳繃");
+ dto.setMsg(dto.getMsg()+PZH+DateUtils.convert(new Date())+" "+"鍞墠缁勯暱" + planLeader.getNickname() + "瀹℃壒閫氳繃");
}
dto.setTime(DateUtils.convert(new Date()));
break;
@@ -494,7 +511,7 @@
if (Cools.isEmpty(dto.getMsg())){
dto.setMsg("瑙勫垝鍛�" + plannerUser.getNickname() + "瀹℃壒閫氳繃");
}else {
- dto.setMsg(dto.getMsg()+" 鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�� "+DateUtils.convert(new Date())+" "+"瑙勫垝鍛�" + plannerUser.getNickname() + "瀹℃壒閫氳繃");
+ dto.setMsg(dto.getMsg()+PZH+DateUtils.convert(new Date())+" "+"瑙勫垝鍛�" + plannerUser.getNickname() + "瀹℃壒閫氳繃");
}
dto.setTime(DateUtils.convert(new Date()));
break;
@@ -534,7 +551,7 @@
if (Cools.isEmpty(dto.getMsg())){
dto.setMsg("涓氬姟鍛�" + salesman0.getNickname() + "瀹℃壒閫氳繃");
}else {
- dto.setMsg(dto.getMsg()+" 鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�� "+DateUtils.convert(new Date())+" "+"涓氬姟鍛�" + salesman0.getNickname() + "瀹℃壒閫氳繃");
+ dto.setMsg(dto.getMsg()+PZH+DateUtils.convert(new Date())+" "+"涓氬姟鍛�" + salesman0.getNickname() + "瀹℃壒閫氳繃");
}
dto.setTime(DateUtils.convert(new Date()));
break;
@@ -574,16 +591,19 @@
List<SettleDto> planDtoList = new ArrayList<>();
boolean sign = true;
for (SettleDto dto : planDtos) {
+ if (dto.getStep().equals(2)){
+ plan.setDirector(dto.getUserId());
+ }
if (sign && dto.getUserId().equals(directorId) && plan.getSettle()+1==dto.getStep()){
if (Cools.isEmpty(dto.getMsg())){
dto.setMsg(DateUtils.convert(now)+" "+director.getNickname()+"鍥為��瀹℃壒");
}else {
- dto.setMsg(dto.getMsg()+" 鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�� "+DateUtils.convert(now)+" "+director.getNickname()+"鍥為��瀹℃壒");
+ dto.setMsg(dto.getMsg()+PZH+DateUtils.convert(now)+" "+director.getNickname()+"鍥為��瀹℃壒");
}
sign = false;
}
if (sign){
- dto.setMsg(dto.getMsg()+" 鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�� "+DateUtils.convert(now)+" "+director.getNickname()+"鍥為��瀹℃壒");
+ dto.setMsg(dto.getMsg()+PZH+DateUtils.convert(now)+" "+director.getNickname()+"鍥為��瀹℃壒");
}
planDtoList.add(dto);
@@ -591,11 +611,9 @@
plan.setStatus(0);
plan.setStep(1);
plan.setSettle(1);
-
- PlanType planType = planTypeService.selectById(plan.getPlanType());
- User planLeader = planTypeService.findPlanLeader(planType);
- plan.setDirector(planLeader.getId());
plan.setSettleMsg(JSON.toJSONString(planDtoList));
+ plan.setUpdateBy(getUserId());
+ plan.setUpdateTime(now);
planService.updateById(plan);
return R.ok("鍥為��鎴愬姛");
}
@@ -673,12 +691,24 @@
wrapper.like("name", condition);
wrapper.eq("status",1);
- int type =1;
- if (getUser().getNickname().equals("鏉庝笘璞�2绾�")){
- type=2;
+
+ ProcessPermissions processPermissions1 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 5).eq("process", "1-1"));//2锛氭牳浠锋祦绋�
+ User manager1 = userService.selectById(processPermissions1.getUserId()); // 鑾峰彇鏍镐环娴佺▼鑺傜偣1纭浜�
+
+ ProcessPermissions processPermissions2 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 5).eq("process", "1-2"));//2锛氭牳浠锋祦绋�
+ User manager2 = userService.selectById(processPermissions2.getUserId()); // 鑾峰彇鏍镐环娴佺▼鑺傜偣1纭浜�
+
+
+ int type =0;
+ if (getUserId().equals(manager1.getId())){
+ type=1;//(璐ф灦)
+ }else if (getUserId().equals(manager2.getId())){
+ type = 2;//(闆嗘垚)
+ }else {
+ return R.error("浣犱笉鏄牳浠峰憳,鏃犳潈鎺ヤ换鍔�");
}
- List<Long> typeList = new ArrayList<>();
+ List<Long> typeList = new ArrayList<>();
List<PlanType> planTypes = planTypeService.selectList(new EntityWrapper<PlanType>().eq("type", type));
for (PlanType planType : planTypes){
typeList.add(planType.getId());
--
Gitblit v1.9.1