From 9c3c9bf7dfaf0f1c162a6aa06fdb7ca81711f70d Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 10 十月 2023 11:49:07 +0800
Subject: [PATCH] #回退流程相关
---
src/main/java/com/zy/crm/manager/controller/PlanController.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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..61a96cd 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -56,6 +56,9 @@
@Autowired
private SmsCodeService smsCodeService;
+ String PZH=" 鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�� ";
+
+
@GetMapping(value = "/plan/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
@@ -434,7 +437,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 +497,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 +537,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 +577,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,10 +597,6 @@
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));
planService.updateById(plan);
return R.ok("鍥為��鎴愬姛");
--
Gitblit v1.9.1