From 1bf5dd9a87cddbb773ff4bc60189f32bd6854028 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 16 十月 2023 10:37:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/entity/PriOnline2.java | 4
src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java | 133 +++++++++++++-------------
src/main/webapp/views/priOnline2/priOnline.html | 9 -
src/main/java/com/zy/crm/manager/controller/DashboardController.java | 23 ++++
src/main/java/com/zy/crm/common/model/SettleDto.java | 36 +++++++
src/main/java/com/zy/crm/manager/controller/PriQuoteController.java | 2
src/main/webapp/static/js/priOnline2/priOnline.js | 2
src/main/java/com/zy/crm/manager/controller/OrderController.java | 2
src/main/webapp/views/processPermissions/processPermissions.html | 64 ++++++------
9 files changed, 160 insertions(+), 115 deletions(-)
diff --git a/src/main/java/com/zy/crm/common/model/SettleDto.java b/src/main/java/com/zy/crm/common/model/SettleDto.java
index aacfa97..4fa7f41 100644
--- a/src/main/java/com/zy/crm/common/model/SettleDto.java
+++ b/src/main/java/com/zy/crm/common/model/SettleDto.java
@@ -96,7 +96,7 @@
list.add(dto);
break;
case 3:
- dto.setTitle("鎬昏鍔炲鏍�");
+ dto.setTitle("鎬荤粡鍔炲鏍�");
dto.setUserId(president.getId());
dto.setUsername(president.getNickname());
list.add(dto);
@@ -250,6 +250,40 @@
return list;
}
+ public static List<SettleDto> initSalesPricingPriOnline2(User user,User userUp,List<String> names ,int nodes) {
+ List<SettleDto> list = new ArrayList<>();
+ for (int i = 0; i < nodes+1; i++) {
+ SettleDto dto = new SettleDto();
+ dto.setStep(i);
+ switch (i) {
+ case 0:
+ dto.setTitle("寮�濮�");
+ dto.setMsg(user.getUsername() + names.get(i));
+ dto.setUserId(user.getId());
+ dto.setUsername(user.getUsername());
+ dto.setTime(DateUtils.convert(new Date()));
+ dto.setCurr(Boolean.TRUE);
+ list.add(dto);
+ break;
+ case 1:
+ dto.setTitle(names.get(i));
+ dto.setUserId(user.getId());
+ dto.setUsername(user.getNickname());
+ list.add(dto);
+ break;
+ case 2:
+ dto.setTitle(names.get(i));
+ dto.setUserId(userUp.getId());
+ dto.setUsername(userUp.getUsername());
+ list.add(dto);
+ break;
+ default:
+ break;
+ }
+ }
+ return list;
+ }
+
public static List<SettleDto> initContract(User manager ,User user,User president,List<String> names ,int nodes) {
List<SettleDto> list = new ArrayList<>();
for (int i = 0; i < nodes+1; i++) {
diff --git a/src/main/java/com/zy/crm/manager/controller/DashboardController.java b/src/main/java/com/zy/crm/manager/controller/DashboardController.java
index 633cf6e..09e9207 100644
--- a/src/main/java/com/zy/crm/manager/controller/DashboardController.java
+++ b/src/main/java/com/zy/crm/manager/controller/DashboardController.java
@@ -131,7 +131,28 @@
@ManagerAuth
public R getCurrentMonthData() {
List<Double> list = orderService.selectCurrentYearMonthSuccess();
- return R.ok().add(list);
+ List<Double> lists = new ArrayList<>();
+ int i = 0;
+ Double[] money=new Double[]{0.0,0.0,0.0,0.0};
+ for (Double d : list){
+ if (i<3){
+ money[0] = money[0]+d;
+ }else if (i<6){
+ money[1] = money[1]+d;
+ }else if (i<9){
+ money[2] = money[2]+d;
+ }else if (i<12){
+ money[3] = money[3]+d;
+ }
+ i++;
+ }
+ for (Double d : money){
+ double d1=d/3;
+ lists.add(d1);
+ lists.add(d1);
+ lists.add(d1);
+ }
+ return R.ok().add(lists);
}
@RequestMapping("/dashboard/popup/auth")
diff --git a/src/main/java/com/zy/crm/manager/controller/OrderController.java b/src/main/java/com/zy/crm/manager/controller/OrderController.java
index e7fe05e..1d09de6 100644
--- a/src/main/java/com/zy/crm/manager/controller/OrderController.java
+++ b/src/main/java/com/zy/crm/manager/controller/OrderController.java
@@ -195,7 +195,7 @@
case 0:
dto.setMsg(dto.getMsg()+" 鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�� "+DateUtils.convert(now)+" 璺熻釜椤圭洰淇敼璐熻矗浜轰负锛�"+priOnline2.getUser$());
break;
- case 3:
+ case 2:
dto.setUserId(priOnline2.getUserId());
dto.setUsername(priOnline2.getUser$());
break;
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 b140a93..d7d7733 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
@@ -65,7 +65,7 @@
assert priOnline2 != null;
JSONObject resultObj = JSON.parseObject(JSON.toJSONString(priOnline2));
// 姝ラ鏉＄浉鍏�
- resultObj.put("step", priOnline2.getSettle() == 4 ? 0 : priOnline2.getSettle() + 1);
+ resultObj.put("step", priOnline2.getSettle() == 3 ? 0 : priOnline2.getSettle() + 1);
return R.ok().add(resultObj);
}
@@ -180,21 +180,20 @@
// }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纭浜�
+// 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纭浜�
// 鑾峰彇涓氬姟鍛�
List<String> initNames = new ArrayList<>();
initNames.add("鎺ュ彇鏍镐环浠诲姟");
initNames.add("瀹屾垚鏍镐环");
- initNames.add("缁忕悊瀹℃牳");
+// initNames.add("缁忕悊瀹℃牳");
initNames.add("涓氬姟鍛樼‘璁�");
- priOnline2.setSettleMsg(JSON.toJSONString(SettleDto.initSalesPricing(manager,getUser(),userUp,initNames,3)));
+ priOnline2.setSettleMsg(JSON.toJSONString(SettleDto.initSalesPricingPriOnline2(getUser(),userUp,initNames,2)));
//璁剧疆椤圭洰娴佺▼
plan.setStep(2);
@@ -490,10 +489,10 @@
User user = userService.selectById(priOnline2.getMemberId());
Plan plan1 = planService.selectById(priOnline2.getItemId());
- PlanType planType1 = planTypeService.selectById(plan1.getPlanType());
-
- ProcessPermissions processPermissions1 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 5).eq("process", "2-"+planType1.getType()));//2锛氭牳浠锋祦绋�
- User manager1 = userService.selectById(processPermissions1.getUserId()); // 鑾峰彇鎶ヤ环娴佺▼鑺傜偣2纭浜�
+// PlanType planType1 = planTypeService.selectById(plan1.getPlanType());
+//
+// ProcessPermissions processPermissions1 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 5).eq("process", "2-"+planType1.getType()));//2锛氭牳浠锋祦绋�
+// User manager1 = userService.selectById(processPermissions1.getUserId()); // 鑾峰彇鎶ヤ环娴佺▼鑺傜偣2纭浜�
if (Cools.isEmpty(getUser())) {
return R.error("鎶辨瓑锛屾偍娌℃湁鎻愪氦鐨勬潈闄�");
@@ -526,63 +525,63 @@
priOnline2.setSettle(1);
priOnline2.setUpdateUserId(getUserId());
priOnline2.setUpdateTime(now);
- priOnline2.setMemberId(manager1.getId());
+ priOnline2.setMemberId(plan1.getUserId());
if (!priOnline2Service.updateById(priOnline2)) {
throw new CoolException("鎻愪氦澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
break;
- case 1:
- // 鏈儴闂ㄧ粡鐞嗗鏍� 鑺傜偣璐熻矗浜�
- 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;
+// case 1:
+// // 鏈儴闂ㄧ粡鐞嗗鏍� 鑺傜偣璐熻矗浜�
+// 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 姝ラ鏁版嵁
+// List<SettleDto> list = JSON.parseArray(priOnline2.getSettleMsg(), SettleDto.class);
+// for (SettleDto dto : list) {
+// switch (dto.getStep()) {
+// case 1:
+// dto.setCurr(Boolean.FALSE);
+// break;
+// case 2:
+// dto.setCurr(Boolean.TRUE);
+// if (Cools.isEmpty(dto.getMsg())){
+// dto.setMsg(manager.getNickname() + "瀹℃壒閫氳繃");
+// }else {
+// dto.setMsg(dto.getMsg()+PZH+DateUtils.convert(new Date())+" " + manager.getNickname() + "瀹℃壒閫氳繃");
+// }
+// dto.setTime(DateUtils.convert(now));
+// break;
+// default:
+// break;
+// }
+// }
+// priOnline2.setSettleMsg(JSON.toJSONString(list));
+//
+// // 淇敼瑙勫垝鍗曠姸鎬�
+// priOnline2.setSettle(2); // 鐢宠閫氳繃
+// priOnline2.setUpdateTime(now);
+// priOnline2.setUpdateUserId(getUserId());
+// priOnline2.setMemberId(plan.getUserId());
+// if (!priOnline2Service.updateById(priOnline2)) {
+// throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
+// }
+// } else {
+// return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄愶紒锛侊紒");
// }
- if (manager.getId().equals(getUserId())) {
-
- // 淇敼 settle 姝ラ鏁版嵁
- List<SettleDto> list = JSON.parseArray(priOnline2.getSettleMsg(), SettleDto.class);
- for (SettleDto dto : list) {
- switch (dto.getStep()) {
- case 1:
- dto.setCurr(Boolean.FALSE);
- break;
- case 2:
- dto.setCurr(Boolean.TRUE);
- if (Cools.isEmpty(dto.getMsg())){
- dto.setMsg(manager.getNickname() + "瀹℃壒閫氳繃");
- }else {
- dto.setMsg(dto.getMsg()+PZH+DateUtils.convert(new Date())+" " + manager.getNickname() + "瀹℃壒閫氳繃");
- }
- dto.setTime(DateUtils.convert(now));
- break;
- default:
- break;
- }
- }
- priOnline2.setSettleMsg(JSON.toJSONString(list));
-
- // 淇敼瑙勫垝鍗曠姸鎬�
- priOnline2.setSettle(2); // 鐢宠閫氳繃
- priOnline2.setUpdateTime(now);
- priOnline2.setUpdateUserId(getUserId());
- priOnline2.setMemberId(plan.getUserId());
- if (!priOnline2Service.updateById(priOnline2)) {
- throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
- } else {
- return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄愶紒锛侊紒");
- }
- break;
- case 2:
+// break;
+ case 1:
// 涓氬姟鍛�
User salesman0 = userService.selectById(priOnline2.getUserId());
if (!getUserId().equals(salesman0.getId())) {
@@ -592,10 +591,10 @@
List<SettleDto> list2 = JSON.parseArray(priOnline2.getSettleMsg(), SettleDto.class);
for (SettleDto dto : list2) {
switch (dto.getStep()) {
- case 2:
+ case 1:
dto.setCurr(Boolean.TRUE);
break;
- case 3:
+ case 2:
dto.setCurr(Boolean.TRUE);
if (Cools.isEmpty(dto.getMsg())){
dto.setMsg("涓氬姟鍛�" + salesman0.getNickname() + "瀹℃壒閫氳繃");
@@ -610,7 +609,7 @@
}
priOnline2.setSettleMsg(JSON.toJSONString(list2));
// 淇敼瑙勫垝鍗曠姸鎬�
- priOnline2.setSettle(3); // 瀹℃壒閫氳繃
+ priOnline2.setSettle(2); // 瀹℃壒閫氳繃
priOnline2.setStatus(1);
priOnline2.setUpdateTime(new Date());
priOnline2.setUpdateUserId(getUserId());
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 16d7faa..c26b42f 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
@@ -527,7 +527,7 @@
if (Cools.isEmpty(dto.getMsg())){
dto.setMsg("鎬昏鍔�" + planLeader.getNickname() + "瀹℃壒閫氳繃");
}else {
- dto.setMsg(dto.getMsg()+PZH+DateUtils.convert(new Date())+" "+"鎬昏鍔�" + planLeader.getNickname() + "瀹℃壒閫氳繃");
+ dto.setMsg(dto.getMsg()+PZH+DateUtils.convert(new Date())+" "+"鎬荤粡鍔�" + planLeader.getNickname() + "瀹℃壒閫氳繃");
}
dto.setTime(DateUtils.convert(new Date()));
break;
diff --git a/src/main/java/com/zy/crm/manager/entity/PriOnline2.java b/src/main/java/com/zy/crm/manager/entity/PriOnline2.java
index bee829b..b1ec503 100644
--- a/src/main/java/com/zy/crm/manager/entity/PriOnline2.java
+++ b/src/main/java/com/zy/crm/manager/entity/PriOnline2.java
@@ -163,10 +163,8 @@
case 0:
return "绛夊緟鎻愪氦";
case 1:
- return "绛夊緟瀹℃壒";
- case 2:
return "绛夊緟纭";
- case 3:
+ case 2:
return "瀹℃壒閫氳繃";
default:
return String.valueOf(this.settle);
diff --git a/src/main/webapp/static/js/priOnline2/priOnline.js b/src/main/webapp/static/js/priOnline2/priOnline.js
index 05e67a8..e520e86 100644
--- a/src/main/webapp/static/js/priOnline2/priOnline.js
+++ b/src/main/webapp/static/js/priOnline2/priOnline.js
@@ -278,7 +278,7 @@
}, function (i) {
layer.close(i);
// 鎸囧畾瑙勫垝鍛�
- if (data.settle === 2) {
+ if (data.settle === 1) {
admin.open({
type: 1,
area: '300px',
diff --git a/src/main/webapp/views/priOnline2/priOnline.html b/src/main/webapp/views/priOnline2/priOnline.html
index 81e0f95..73d1a00 100644
--- a/src/main/webapp/views/priOnline2/priOnline.html
+++ b/src/main/webapp/views/priOnline2/priOnline.html
@@ -75,18 +75,11 @@
<script type="text/html" id="operate">
{{# if (d.settle == 0) { }}
<a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">鎻愪氦</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
{{# } }}
{{# if (d.settle == 1) { }}
- <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">瀹℃壒</a>
- {{# } }}
- {{# if (d.settle == 2) { }}
<a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">纭</a>
- {{# } }}
- {{# if (d.settle == 1 || d.settle == 2) { }}
<a class="layui-btn layui-btn-xs btn-edit" lay-event="approvalEnd">鍥為��瀹℃壒</a>
- {{# } }}
- {{# if (d.settle == 0 || d.settle == 1) { }}
- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
{{# } }}
<a class="layui-btn layui-btn-xs btn-edit" lay-event="check">鏍镐环</a>
<a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>
diff --git a/src/main/webapp/views/processPermissions/processPermissions.html b/src/main/webapp/views/processPermissions/processPermissions.html
index 1bc63b8..0d776cd 100644
--- a/src/main/webapp/views/processPermissions/processPermissions.html
+++ b/src/main/webapp/views/processPermissions/processPermissions.html
@@ -108,7 +108,7 @@
<div class="layui-row">
<div class="layui-col-md12">
<div class="layui-form-item">
- <label class="layui-form-label">鍛樺伐濮撳悕: </label>
+ <label class="layui-form-label layui-form-required">鍛樺伐濮撳悕: </label>
<div class="layui-input-inline cool-auto-complete">
<input id="userName" class="layui-input" name="userName" type="text" placeholder="璇烽�夋嫨鍛樺伐" autocomplete="off" style="display: none" lay-verify="required">
<input id="userName$" name="userName" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="鍛樺伐濮撳悕" onfocus=this.blur()>
@@ -185,37 +185,37 @@
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鏉冮檺绫诲瀷: </label>
- <div class="layui-input-block">
- <select name="processMemo" lay-vertype="tips" lay-verify="required">
- <option value="">璇烽�夋嫨鐘舵��</option>
- <option value="1">鏍镐环娴佺▼</option>
- <option value="2">鎶ヤ环娴佺▼</option>
- <option value="3">鎶ラ攢娴佺▼</option>
- <option value="4">鍑哄樊娴佺▼</option>
- <option value="5">鏍镐环娴佺▼</option>
- <option value="7">鍚堝悓绠＄悊</option>
- </select>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鏉冮檺鑺傜偣: </label>
- <div class="layui-input-block">
- <select name="process" lay-vertype="tips" lay-verify="required">
- <option value="">璇烽�夋嫨鐘舵��</option>
- <option value="1-1">1-1</option>
- <option value="1-2">1-2</option>
- <option value="2-1">2-1</option>
- <option value="3-1">3-1</option>
- <option value="3-2">3-2</option>
- <option value="4-1">4-1</option>
- <option value="5-1">5-1</option>
- <option value="6-1">6-1</option>
- <option value="7-1">7-1</option>
- </select>
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label layui-form-required">鏉冮檺绫诲瀷: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <select name="processMemo" lay-vertype="tips" lay-verify="required">-->
+<!-- <option value="">璇烽�夋嫨鐘舵��</option>-->
+<!-- <option value="1">鏍镐环娴佺▼</option>-->
+<!-- <option value="2">鎶ヤ环娴佺▼</option>-->
+<!-- <option value="3">鎶ラ攢娴佺▼</option>-->
+<!-- <option value="4">鍑哄樊娴佺▼</option>-->
+<!-- <option value="5">鏍镐环娴佺▼</option>-->
+<!-- <option value="7">鍚堝悓绠＄悊</option>-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label layui-form-required">鏉冮檺鑺傜偣: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <select name="process" lay-vertype="tips" lay-verify="required">-->
+<!-- <option value="">璇烽�夋嫨鐘舵��</option>-->
+<!-- <option value="1-1">1-1</option>-->
+<!-- <option value="1-2">1-2</option>-->
+<!-- <option value="2-1">2-1</option>-->
+<!-- <option value="3-1">3-1</option>-->
+<!-- <option value="3-2">3-2</option>-->
+<!-- <option value="4-1">4-1</option>-->
+<!-- <option value="5-1">5-1</option>-->
+<!-- <option value="6-1">6-1</option>-->
+<!-- <option value="7-1">7-1</option>-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-form-item">
<label class="layui-form-label">澶囨敞: </label>
<div class="layui-input-block">
--
Gitblit v1.9.1