From 03b0a7674513a528354ca91d70a8e71857984d33 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 09 十月 2023 14:17:02 +0800
Subject: [PATCH] #流程相关
---
src/main/java/com/zy/crm/manager/entity/ProcessPermissions.java | 2 ++
src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java | 49 ++++++++++++++++++++++++++++++++++---------------
src/main/webapp/views/processPermissions/processPermissions.html | 2 ++
3 files changed, 38 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java b/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
index bffd268..ea85bb5 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
@@ -42,7 +42,10 @@
private PlanService planService;
@Autowired
- private PriSalesService priSalesService;
+ private PlanTypeService planTypeService;
+
+ @Autowired
+ private ProcessPermissionsService processPermissionsService;
@Autowired
private PriQuoteService priQuoteService;
@@ -165,12 +168,20 @@
priOnline2.setSettle(0);
- User manager = new User();
- try{
- manager = userService.getDeptManager(getHostId(), getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
- }catch (Exception e){
- manager = getUser();
- }
+// User manager = new User();
+// try{
+// manager = userService.getDeptManager(getHostId(), getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
+// }catch (Exception e){
+// manager = getUser();
+// }
+ String node="2-";
+
+ PlanType planType = planTypeService.selectById(plan.getPlanType());
+ node = node+planType.getType();
+
+ ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 5).eq("process", node));//2锛氭姤浠锋祦绋�
+ User manager = userService.selectById(processPermissions.getUserId()); // 鑾峰彇鎶ヤ环娴佺▼鑺傜偣2纭浜�
+
User userUp = userService.selectById(plan.getUserId()); // 鑾峰彇涓氬姟鍛�
List<String> initNames = new ArrayList<>();
initNames.add("鎺ュ彇鏍镐环浠诲姟");
@@ -469,14 +480,21 @@
}
break;
case 1:
- // 鏈儴闂ㄧ粡鐞嗗鏍�
User user = userService.selectById(priOnline2.getUserId());
- User manager = new User();
- try{
- manager = userService.getDeptManager(getHostId(), getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
- }catch (Exception e){
- manager = user;
- }
+
+ // 鏈儴闂ㄧ粡鐞嗗鏍� 鑺傜偣璐熻矗浜�
+ Plan plan = planService.selectById(priOnline2.getItemId());
+ PlanType planType = planTypeService.selectById(plan.getPlanType());
+
+ ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 5).eq("process", "2-"+planType.getType()));//2锛氭姤浠锋祦绋�
+ User manager = userService.selectById(processPermissions.getUserId()); // 鑾峰彇鎶ヤ环娴佺▼鑺傜偣2纭浜�
+
+// User manager = new User();
+// try{
+// manager = userService.getDeptManager(getHostId(), getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
+// }catch (Exception e){
+// manager = user;
+// }
if (manager.getId().equals(getUserId())) {
// 淇敼 settle 姝ラ鏁版嵁
@@ -488,7 +506,7 @@
break;
case 2:
dto.setCurr(Boolean.TRUE);
- dto.setMsg("閮ㄩ棬缁忕悊" + manager.getNickname() + "瀹℃壒閫氳繃");
+ dto.setMsg(manager.getNickname() + "瀹℃壒閫氳繃");
dto.setTime(DateUtils.convert(now));
break;
default:
@@ -532,6 +550,7 @@
priOnline2.setSettleMsg(JSON.toJSONString(list2));
// 淇敼瑙勫垝鍗曠姸鎬�
priOnline2.setSettle(3); // 瀹℃壒閫氳繃
+ priOnline2.setStatus(1);
priOnline2.setUpdateTime(new Date());
if (!priOnline2Service.updateById(priOnline2)) {
diff --git a/src/main/java/com/zy/crm/manager/entity/ProcessPermissions.java b/src/main/java/com/zy/crm/manager/entity/ProcessPermissions.java
index 4ef6362..345d167 100644
--- a/src/main/java/com/zy/crm/manager/entity/ProcessPermissions.java
+++ b/src/main/java/com/zy/crm/manager/entity/ProcessPermissions.java
@@ -133,6 +133,8 @@
return "鎶ラ攢娴佺▼";
case 4:
return "鍑哄樊娴佺▼";
+ case 5:
+ return "鏍镐环娴佺▼";
case 7:
return "鍚堝悓绠＄悊";
default:
diff --git a/src/main/webapp/views/processPermissions/processPermissions.html b/src/main/webapp/views/processPermissions/processPermissions.html
index 42c52b5..04f8c98 100644
--- a/src/main/webapp/views/processPermissions/processPermissions.html
+++ b/src/main/webapp/views/processPermissions/processPermissions.html
@@ -32,6 +32,7 @@
<option value="2">鎶ヤ环娴佺▼</option>
<option value="3">鎶ラ攢娴佺▼</option>
<!-- <option value="4">鍑哄樊娴佺▼</option>-->
+ <option value="5">鏍镐环娴佺▼</option>
<option value="7">鍚堝悓绠＄悊</option>
</select>
</div>
@@ -43,6 +44,7 @@
<option value="">璇烽�夋嫨鐘舵��</option>
<option value="1-1">1-1</option>
<option value="2-1">2-1</option>
+ <option value="2-2">2-2</option>
<option value="3-1">3-1</option>
<option value="3-2">3-2</option>
<option value="4-1">4-1</option>
--
Gitblit v1.9.1