From 3ac5ee0ef5f6b1ca9537786c4c98556892a2fe4c Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 09 十月 2023 16:27:10 +0800
Subject: [PATCH] #流程相关
---
src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java | 49 ++++++++++++++++++++++++++++---------------------
1 files changed, 28 insertions(+), 21 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 42d337b..b5e5cbf 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
@@ -144,24 +144,28 @@
priOnline2.setItemId(Long.parseLong(map.get("itemId").toString()));
SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss");
priOnline2.setOrderNum(format.format(new Date()));
- //鍒涘缓浜哄憳
- priOnline2.setUserId(getUserId());
- //鍒涘缓浜哄憳閮ㄩ棬
- priOnline2.setDeptId(getDeptId());
- //鏇存柊鏃堕棿
- priOnline2.setUpdateTime(new Date());
- //鏇存柊浜哄憳
- priOnline2.setUpdateUserId(getUserId());
- //鐘舵�侊紝鏈畬鎴�
- priOnline2.setStatus(0);
//涓氬姟鍛�
// Item item = itemService.selectById(priOnline.getItemId());
Plan plan = planService.selectById(priOnline2.getItemId());
+ User userUp = userService.selectById(plan.getUserId());
+
+ //涓氬姟鍛�
+ priOnline2.setUserId(userUp.getId());
+ //涓氬姟鍛橀儴闂�
+ priOnline2.setDeptId(userUp.getDeptId());
+ //鏇存柊浜哄憳
+ priOnline2.setUpdateUserId(getUserId());
+ //鏇存柊鏃堕棿
+ priOnline2.setUpdateTime(new Date());
+
+ //鐘舵�侊紝鏈畬鎴�
+ priOnline2.setStatus(0);
+
if (plan.getStatus()!=1){
return R.error("姝よ鍒掑崟鐘舵�佹敼鍙橈紝璇峰埛鏂伴〉闈㈤噸鏂伴�夋嫨锛�");
}
- priOnline2.setMemberId(plan.getUserId());
+ priOnline2.setMemberId(getUserId());
Cstmr cstmr = cstmrService.selectById(plan.getCstmrId());
priOnline2.setTemplateName(cstmr.getName()); //鐢叉柟鍗曚綅鍚嶇О
@@ -182,7 +186,7 @@
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("鎺ュ彇鏍镐环浠诲姟");
initNames.add("瀹屾垚鏍镐环");
@@ -515,6 +519,8 @@
// 淇敼瑙勫垝鍗曠姸鎬�
priOnline2.setSettle(2); // 鐢宠閫氳繃
priOnline2.setUpdateTime(now);
+ priOnline2.setUpdateUserId(getUserId());
+ priOnline2.setMemberId(plan.getUserId());
if (!priOnline2Service.updateById(priOnline2)) {
throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
@@ -549,6 +555,7 @@
priOnline2.setSettle(3); // 瀹℃壒閫氳繃
priOnline2.setStatus(1);
priOnline2.setUpdateTime(new Date());
+ priOnline2.setUpdateUserId(getUserId());
if (!priOnline2Service.updateById(priOnline2)) {
throw new CoolException("纭澶辫触锛岃鑱旂郴绠＄悊鍛�");
@@ -585,25 +592,23 @@
priQuote.setOrderNum(priOnline2.getOrderNum());
SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss");
priQuote.setInOrderNum(format.format(new Date()));
-
- //鍒涘缓浜哄憳
- priQuote.setUserId(getUserId());
+ //涓氬姟鍛�
+ Plan plan = planService.selectById(priQuote.getItemId());
+ User userUp = userService.selectById(plan.getUserId());
+ //涓氬姟鍛�
+ priQuote.setUserId(userUp.getId());
//鏇存柊浜哄憳
priQuote.setUpdateUserId(getUserId());
//鎵�灞為儴闂�
- priQuote.setDeptId(getDeptId());
+ priQuote.setDeptId(userUp.getDeptId());
//鏇存柊鏃堕棿
priQuote.setUpdateTime(new Date());
//妯℃澘
Integer i = priType == 1L ? 1 : 2;
priQuote.setTemplate(i.toString());
- //涓氬姟鍛�
- Plan plan = planService.selectById(priQuote.getItemId());
- priQuote.setMemberId(plan.getUserId());
-
//璁剧疆椤圭洰娴佺▼
- plan.setStep(5);
+ plan.setStep(3);
// priQuote.setForm(JSON.toJSONString(map)); // 鑷畾涔夎〃鍗曞唴瀹�
priQuote.setSettle(1); // 1.寮�濮�
@@ -613,6 +618,8 @@
}catch (Exception e){
manager = getUser();
}
+ priQuote.setMemberId(manager.getId());
+
ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 2).eq("process", "3-1"));//2锛氭姤浠锋祦绋�
User president = userService.selectById(processPermissions.getUserId()); // 鑾峰彇鎶ヤ环娴佺▼鑺傜偣3-1纭浜�
priQuote.setSettleMsg(JSON.toJSONString(SettleDto.initPriQuote(plan, manager,president,getUser())));
--
Gitblit v1.9.1