From 8b109f923dc7c2d5c5bd351a03a5277670962aac Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 04 十二月 2023 13:05:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java | 98 +++++++++---------------------------------------
1 files changed, 19 insertions(+), 79 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 66985c7..acba7ea 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java
@@ -112,9 +112,11 @@
convert(param, wrapper);
allLike(PriOnline2.class, param.keySet(), wrapper, condition);
wrapper.or().eq("member_id", getUserId());
- if (!Cools.isEmpty(orderByField)) {
- wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
- }
+// if (!Cools.isEmpty(orderByField)) {
+// wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+// }
+ wrapper.orderBy("update_time",false);
+ wrapper.orderBy("create_time",false);
return R.ok(priOnline2Service.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -157,7 +159,7 @@
}
if (!signUserId && !signDeptId) {
if (getRole().getId() == 1) {
- wrapper.or().eq("host_id", 1);
+ wrapper.or().eq("host_id", getHostId());
} else if (getRole().getId() == 2) {
wrapper.eq("dept_id", getDeptId());
} else {
@@ -165,72 +167,9 @@
}
}
if (signHostId) {
- wrapper.or().eq("host_id", 1);
+ wrapper.or().eq("host_id", getHostId());
}
}
-// @RequestMapping(value = "/priOnline2/HJ/add/auth")
-// @ManagerAuth(memo = "鎺ュ彇闆嗘垚鏍镐环浠诲姟")
-// public R addHJ(PriOnline2 priOnline2) {
-// PriOnline2 priOnline21 = priOnline2Service.selectById(priOnline2.getId());
-// if (priOnline21.getSettle()!=1 || !priOnline21.getMemberId().equals(0L)){
-// return R.error("姝ら泦鎴愭牳浠峰崟鐘舵�佸凡鏀瑰彉锛岃鍒锋柊椤甸潰閲嶆柊閫夋嫨锛�");
-// }
-// Date now = new Date();
-// priOnline21.setMemberId(getUserId());
-//
-//
-// List<SettleDto> planDtos = JSON.parseArray(priOnline21.getSettleMsg(), SettleDto.class);
-// List<SettleDto> planDtoList = new ArrayList<>();
-// for (SettleDto dto : planDtos) {
-// if (dto.getStep().equals(2)) {
-// dto.setUserId(getUserId());
-// dto.setUsername(getUser().getNickname());
-// if (Cools.isEmpty(dto.getMsg())) {
-// dto.setMsg(getUser().getNickname() + "鎺ュ彇鏍镐环");
-// } else {
-// dto.setMsg(dto.getMsg() + PZH + DateUtils.convert(now) + " " + getUser().getNickname() + "鎺ュ彇鏍镐环");
-// }
-// dto.setTime(DateUtils.convert(new Date()));
-// }
-// planDtoList.add(dto);
-// }
-// priOnline21.setSettleMsg(JSON.toJSONString(planDtoList));
-// priOnline21.setUpdateUserId(getUserId());
-// priOnline21.setUpdateTime(now);
-// priOnline2Service.updateById(priOnline21);
-// return R.ok("鎺ュ彇鎴愬姛");
-// }
-
-// @RequestMapping(value = "/priOnline2/HJ/search/auth")
-// @ManagerAuth
-// public R priOnline2Search(String condition) {
-// EntityWrapper<PriOnline2> wrapper = new EntityWrapper<>();
-// wrapper.like("template_name", condition);
-// wrapper.eq("member_id",0L);
-//
-// List<ProcessPermissions> processPermissionsList = processPermissionsService.selectList(new EntityWrapper<ProcessPermissions>().eq("process_memo", 5));//2锛氭牳浠锋祦绋�
-// int type =0;
-// for (ProcessPermissions processPermissions:processPermissionsList){
-// if (getUserId().equals(processPermissions.getUserId())){
-// type=1;
-// break;
-// }
-// }
-// if (type==0){
-// return R.error("浣犱笉鏄牳浠峰憳,鏃犳潈鎺ヤ换鍔�");
-// }
-// List<Map<String, Object>> result = new ArrayList<>();
-//
-// List<PriOnline2> priOnline2s = priOnline2Service.selectList(wrapper);
-// for (PriOnline2 priOnline2 : priOnline2s){
-// Map<String, Object> map = new HashMap<>();
-// map.put("id", priOnline2.getId());
-// map.put("name", priOnline2.getTemplateName()+" - ID:"+priOnline2.getId());
-// result.add(map);
-// }
-// return R.ok(result);
-// }
-
@RequestMapping(value = "/priOnline2/add/auth")
@ManagerAuth(memo = "娣诲姞鏍镐环绠＄悊")
@@ -271,10 +210,9 @@
if (plan.getStatus() != 1) {
return R.error("姝よ鍒掑崟鐘舵�佹敼鍙橈紝璇峰埛鏂伴〉闈㈤噸鏂伴�夋嫨锛�");
}
- priOnline2.setMemberId(getUserId());
Cstmr cstmr = cstmrService.selectById(plan.getCstmrId());
- priOnline2.setTemplateName(cstmr.getName()); //鐢叉柟鍗曚綅鍚嶇О
+ priOnline2.setTemplateName(cstmr.getName()); //瀹㈡埛淇℃伅鍚嶇О
priOnline2.setSettle(0);
@@ -286,7 +224,7 @@
// }
// String node="2-";
- PlanType planType = planTypeService.selectById(plan.getPlanType());
+// PlanType planType = planTypeService.selectById(plan.getPlanType());
// node = node+planType.getType();
// ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 5).eq("process", "2-1"));//2锛氭牳浠锋祦绋�
// User manager = userService.selectById(processPermissions.getUserId()); // 鑾峰彇鏍镐环娴佺▼鑺傜偣2纭浜�
@@ -300,11 +238,16 @@
List<User> users = new ArrayList<>();
users.add(getUser());
users.add(getUser());
+// users.add(new User());
users.add(userUp);
priOnline2.setSettleMsg(JSON.toJSONString(SettleDto.InItFlowPath(users, initNames, users.size())));
priOnline2.setSettleSize(users.size());
priOnline2.setPlanId(plan.getId());
-
+ if (users.size()>1){
+ priOnline2.setMemberId(users.get(1).getId());
+ } else {
+ priOnline2.setMemberId(getUserId());
+ }
//璁剧疆椤圭洰娴佺▼
plan.setStep(2);
plan.setStatus(2);
@@ -623,10 +566,7 @@
assert priOnline2 != null;
Date now = new Date();
Long nextUserId = getUserId();
- User user = new User();
- List<SettleDto> list = new ArrayList<>();
-
- user = userService.selectById(priOnline2.getMemberId());
+ User user = userService.selectById(priOnline2.getMemberId());
if (Cools.isEmpty(getUser()) || Cools.isEmpty(user)){
return R.error("鎶辨瓑锛屾偍鏃犻渶纭锛侊紒锛�");
@@ -636,7 +576,7 @@
return R.error("鎶辨瓑锛屾偍鏃犻渶纭锛侊紒锛�");
}
// 淇敼 settle 姝ラ鏁版嵁
- list = JSON.parseArray(priOnline2.getSettleMsg(), SettleDto.class);
+ List<SettleDto> list = JSON.parseArray(priOnline2.getSettleMsg(), SettleDto.class);
for (SettleDto dto : list) {
if (dto.getStep().equals(priOnline2.getSettle())) {
dto.setCurr(Boolean.TRUE);
@@ -687,7 +627,7 @@
} catch (Exception e) {
return R.error("鑷姩鐢熸垚鎶ヤ环鍗曞け璐�");
}
- if (!smsCodeService.sendSmsCodeText(manager.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E)) {
+ if (!smsCodeService.sendSmsCodeText(manager.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E,getUserId())) {
return R.ok("瀹℃壒鎴愬姛浣嗙煭淇″彂閫佸け璐�!");
}
}else {
@@ -701,7 +641,7 @@
}
}else {
User phoneUser = userService.selectById(nextUserId);
- if (!smsCodeService.sendSmsCodeText(phoneUser.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E)) {
+ if (!smsCodeService.sendSmsCodeText(phoneUser.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E,getUserId())) {
return R.ok("瀹℃壒鎴愬姛浣嗙煭淇″彂閫佸け璐�!");
}
}
--
Gitblit v1.9.1