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 ++++++++++++++----------
 src/main/webapp/static/js/priQuote/priQuote.js                        |    4 +-
 src/main/java/com/zy/crm/manager/controller/PlanController.java       |    1 
 src/main/java/com/zy/crm/manager/controller/PriQuoteController.java   |   23 +++++++----
 src/main/webapp/static/js/priOnline2/priOnline.js                     |    4 +-
 5 files changed, 48 insertions(+), 33 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 8fd9277..3f032f9 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -139,6 +139,7 @@
         plan.setUpdateBy(getUserId());
         plan.setUpdateTime(now);
         plan.setStatus(0);
+        plan.setStep(1);
 
         plan.setForm(JSON.toJSONString(param));     // 鑷畾涔夎〃鍗曞唴瀹�
         plan.setSettle(1);  // 1.寮�濮�
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())));
diff --git a/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java b/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
index 039af1f..8309e79 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
@@ -146,20 +146,22 @@
         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());
         //妯℃澘
         priQuote.setTemplate(map.get("template").toString());
 
-        //涓氬姟鍛�
-        Plan plan = planService.selectById(priQuote.getItemId());
-        priQuote.setMemberId(plan.getUserId());
+
 
         //璁剧疆椤圭洰娴佺▼
         plan.setStep(5);
@@ -168,10 +170,11 @@
         priQuote.setSettle(1);  // 1.寮�濮�
         User manager = new User();
         try{
-            manager = userService.getDeptManager(getHostId(), getUser().getDeptId());        // 鑾峰彇閮ㄩ棬棰嗗
+            manager = userService.getDeptManager(getHostId(), userUp.getDeptId());        // 鑾峰彇閮ㄩ棬棰嗗
         }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())));
@@ -456,7 +459,7 @@
                 User user = userService.selectById(priQuote.getUserId());
                 User manager = new User();
                 try{
-                    manager = userService.getDeptManager(getHostId(), getUser().getDeptId());        // 鑾峰彇閮ㄩ棬棰嗗
+                    manager = userService.getDeptManager(getHostId(), user.getDeptId());        // 鑾峰彇閮ㄩ棬棰嗗
                 }catch (Exception e){
                     manager = user;
                 }
@@ -481,7 +484,10 @@
                     priQuote.setSettleMsg(JSON.toJSONString(list));
 
                     // 淇敼瑙勫垝鍗曠姸鎬�
+                    ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 2).eq("process", "3-1"));//2锛氭姤浠锋祦绋�
+                    User planLeader = userService.selectById(processPermissions.getUserId());       // 鑾峰彇鎶ヤ环娴佺▼鑺傜偣3纭浜�
                     priQuote.setSettle(2);  // 鎬昏鍔炲緟瀹�
+                    priQuote.setMemberId(planLeader.getId());
                     priQuote.setUpdateUserId(getUserId());
                     priQuote.setUpdateTime(new Date());
 
@@ -523,6 +529,7 @@
                 // 淇敼瑙勫垝鍗曠姸鎬�
                 priQuote.setSettle(3);  // 瑙勫垝鍛樺緟瀹�
                 priQuote.setUpdateUserId(getUserId());
+                priQuote.setMemberId(priQuote.getUserId());
                 priQuote.setUpdateTime(new Date());
 
                 if (!priQuoteService.updateById(priQuote)) {
diff --git a/src/main/webapp/static/js/priOnline2/priOnline.js b/src/main/webapp/static/js/priOnline2/priOnline.js
index dc60a55..d8f706b 100644
--- a/src/main/webapp/static/js/priOnline2/priOnline.js
+++ b/src/main/webapp/static/js/priOnline2/priOnline.js
@@ -92,9 +92,9 @@
             ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
             ,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿'}
             ,{field: 'status$', align: 'center',title: '鐘舵��'}
-            ,{field: 'memberId$', align: 'center',title: '涓氬姟鍛�'}
+            // ,{field: 'memberId$', align: 'center',title: ''}
             ,{field: 'settle$', align: 'center',title: '杩涘害', style: 'color: #1890ff;cursor:pointer', event: 'more',hide: false}
-            // ,{field: 'user$', align: 'center',title: '鍒涘缓浜哄憳'}
+            ,{field: 'user$', align: 'center',title: '涓氬姟鍛�'}
             ,{field: 'updateUserId$', align: 'center',title: '鏇存柊浜哄憳'}
             ,{field: 'checkDataStatus$', align: 'center',title: '鎶ヤ环鏁版嵁'}
             ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:350}
diff --git a/src/main/webapp/static/js/priQuote/priQuote.js b/src/main/webapp/static/js/priQuote/priQuote.js
index 14cebe8..d7aff82 100644
--- a/src/main/webapp/static/js/priQuote/priQuote.js
+++ b/src/main/webapp/static/js/priQuote/priQuote.js
@@ -99,8 +99,8 @@
             ,{field: 'settle$', align: 'center',title: '杩涘害', style: 'color: #1890ff;cursor:pointer', event: 'more', width: 150,hide: false}
             ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿',hide: false}
             ,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿',hide: false}
-            ,{field: 'memberId$', align: 'center',title: '涓氬姟鍛�',hide: false}
-            ,{field: 'userId$', align: 'center',title: '鍒涘缓浜哄憳',hide: true}
+            // ,{field: 'memberId$', align: 'center',title: '涓氬姟鍛�',hide: false}
+            ,{field: 'userId$', align: 'center',title: '涓氬姟鍛�',hide: true}
             ,{field: 'updateUserId$', align: 'center',title: '鏇存柊浜哄憳',hide: false}
             ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:280}
         ]],

--
Gitblit v1.9.1