From 7804e0f43c902645e29a5a7fccd2c741f86cd312 Mon Sep 17 00:00:00 2001 From: LSH Date: 星期五, 01 十二月 2023 08:14:05 +0800 Subject: [PATCH] # --- src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java | 160 +++++++++++++++++++++++++--------------------------- 1 files changed, 77 insertions(+), 83 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 ddc1a0a..acba7ea 100644 --- a/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java +++ b/src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java @@ -12,6 +12,7 @@ import com.core.common.R; import com.core.domain.KeyValueVo; import com.core.exception.CoolException; +import com.zy.crm.common.entity.PhoneCodeTypeParam; import com.zy.crm.common.model.SettleDto; import com.zy.crm.common.web.BaseController; import com.zy.crm.manager.entity.*; @@ -57,6 +58,12 @@ @Autowired private UserService userService; + @Autowired + private PriOnline2FollService priOnline2FollService; + + @Autowired + private SmsCodeService smsCodeService; + String PZH = " 鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�� "; @RequestMapping(value = "/priOnline2/{id}/auth") @@ -86,21 +93,41 @@ @RequestParam(defaultValue = "10") Integer limit, @RequestParam(required = false) String orderByField, @RequestParam(required = false) String orderByType, + @RequestParam(required = false) String allSwitch, @RequestParam(required = false) String condition, - @RequestParam Map<String, Object> param) { + @RequestParam Map<String, Object> paramSou) { EntityWrapper<PriOnline2> wrapper = new EntityWrapper<>(); wrapper.setSqlSelect("id,title,create_time as createTime,assistant_plan_id as assistantPlanId,host_plan_id as hostPlanId,assistant_host_sign as assistantHostSign,filepath,settle,settle_size as settleSize,item_id as itemId,order_num as orderNum,template_name as templateName,user_id as userId,dept_id as deptId,status,update_time as updateTime,check_data as checkData,update_user_id as updateUserId,member_id as memberId"); // wrapper.in("member_id", getUserRoleBelongsToUserId("allopen")); - excludeTrash(param); + excludeTrash(paramSou); + Map<String, Object> param = convertallSwitch(paramSou); + + if (!Cools.isEmpty(allSwitch)){ + List<PriOnline2> priOnline2List = priOnline2Service.listByAll(getUserId()); + Page<PriOnline2> page1 = new Page<PriOnline2>(curr, limit).setRecords(priOnline2List); + page1.setTotal(priOnline2Service.listByAllTotal(getUserId())); + return R.ok(page1); + } + 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)); } + private Map<String, Object> convertallSwitch(Map<String, Object> map) { + for (Map.Entry<String, Object> entry : map.entrySet()) { + if (entry.getKey().equals("allSwitch")) { + map.remove("allSwitch"); + } + } + return map; + } private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) { boolean signUserId = false; boolean signDeptId = false; @@ -132,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 { @@ -140,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 = "娣诲姞鏍镐环绠$悊") @@ -225,7 +189,10 @@ User userUp = userService.selectById(plan.getUserId()); priOnline2.setAssistantHostSign(plan.getAssistantHostSign()); priOnline2.setAssistantPlanId(plan.getAssistantPlanId()); - priOnline2.setHostPlanId(plan.getHostPlanId()); + priOnline2.setHostPlanId(plan.getId()); + if (plan.getAssistantHostSign()==1){ + priOnline2.setHostPlanId(plan.getHostPlanId()); + } //涓氬姟鍛� @@ -243,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); @@ -258,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纭浜� @@ -272,17 +238,35 @@ 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); planService.updateById(plan); priOnline2Service.insert(priOnline2); + + // 鑷姩娣诲姞璺熻繘浜� + for (User user:users){ + List<PriOnline2Foll> priOnline2Folls = priOnline2FollService.selectList(new EntityWrapper<PriOnline2Foll>().eq("pri_online2_id", priOnline2.getId()).eq("user_id", user.getId())); + if (Cools.isEmpty(priOnline2Folls) || priOnline2Folls.size()==0){ + PriOnline2Foll priOnline2Foll = new PriOnline2Foll(); + priOnline2Foll.setPriOnline2Id(priOnline2.getId()); + priOnline2Foll.setUserId(user.getId()); + if (!priOnline2FollService.insert(priOnline2Foll)) { + throw new CoolException("淇濆瓨澶辫触锛岃閲嶈瘯"); + } + } + } if (plan.getAssistantHostSign()==1){ @@ -582,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("鎶辨瓑锛屾偍鏃犻渶纭锛侊紒锛�"); @@ -595,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); @@ -635,10 +616,19 @@ if (user.getId().equals(priOnline2.getUserId())) { if (priOnline2.getAssistantHostSign()==0){ + User manager = new User(); + try { + manager = userService.getDeptManager(getHostId(), getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗 + } catch (Exception e) { + manager = getUser(); + } try { priQuoteAdd(priOnline2.getId(), plannerId); } catch (Exception e) { return R.error("鑷姩鐢熸垚鎶ヤ环鍗曞け璐�"); + } + if (!smsCodeService.sendSmsCodeText(manager.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E,getUserId())) { + return R.ok("瀹℃壒鎴愬姛浣嗙煭淇″彂閫佸け璐�!"); } }else { try { @@ -649,7 +639,11 @@ return R.error("鏇存柊涓昏〃澶辫触"); } } - + }else { + User phoneUser = userService.selectById(nextUserId); + if (!smsCodeService.sendSmsCodeText(phoneUser.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E,getUserId())) { + return R.ok("瀹℃壒鎴愬姛浣嗙煭淇″彂閫佸け璐�!"); + } } return R.ok("瀹℃壒鎴愬姛"); @@ -716,8 +710,8 @@ @ManagerAuth public R priOnline2priQuoteAdd(@RequestParam Long planId) { List<KeyValueVo> vos = new ArrayList<>(); - vos.add(new KeyValueVo("鎶ヤ环妯℃澘1", 1L)); - vos.add(new KeyValueVo("鎶ヤ环妯℃澘2", 2L)); + vos.add(new KeyValueVo("璐ф灦妯℃澘", 1L)); + vos.add(new KeyValueVo("闆嗘垚妯℃澘", 2L)); return R.ok().add(vos); } -- Gitblit v1.9.1