From 3481efebb5033dd35ce6066d030873a892d1db76 Mon Sep 17 00:00:00 2001 From: LSH Date: 星期二, 28 十一月 2023 14:42:43 +0800 Subject: [PATCH] # --- src/main/java/com/zy/crm/manager/controller/PriQuoteController.java | 198 +++++++++++++++++++----------------------------- 1 files changed, 79 insertions(+), 119 deletions(-) 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 8309e79..ce8f0a9 100644 --- a/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java +++ b/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java @@ -13,6 +13,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.*; @@ -55,6 +56,11 @@ @Autowired private PlanTypeService planTypeService; + @Autowired + private SmsCodeService smsCodeService; + + String PZH=" 鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�� "; + @RequestMapping(value = "/priQuote/{id}/auth") @ManagerAuth public R get(@PathVariable("id") String id) { @@ -82,12 +88,14 @@ @RequestParam(required = false)String condition, @RequestParam Map<String, Object> param){ EntityWrapper<PriQuote> wrapper = new EntityWrapper<>(); - wrapper.setSqlSelect("id,title,create_time as createTime,filepath,item_id as itemId,order_num as orderNum,template_name as templateName,sheet_data as sheetData,user_id as userId,dept_id as deptId,settle,settle_msg as settleMsg,form,update_user_id as updateUserId,update_time as updateTime,in_order_num as inOrderNum,member_id as memberId,template"); + wrapper.setSqlSelect("id,title,create_time as createTime,plan_id as planId,filepath,item_id as itemId,order_num as orderNum,template_name as templateName,sheet_data as sheetData,user_id as userId,dept_id as deptId,settle,settle_msg as settleMsg,form,update_user_id as updateUserId,update_time as updateTime,in_order_num as inOrderNum,member_id as memberId,template"); // wrapper.in("member_id", getUserRoleBelongsToUserId()); excludeTrash(param); convert(param, wrapper); allLike(PriQuote.class, param.keySet(), wrapper, condition); wrapper.or().eq("member_id",getUserId()); + wrapper.orderBy("update_time",false); + wrapper.orderBy("create_time",false); if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} return R.ok(priQuoteService.selectPage(new Page<>(curr, limit), wrapper)); } @@ -122,7 +130,13 @@ } } if (!signUserId && !signDeptId){ - wrapper.eq("user_id", getUserId()); + if (getRole().getId()==1){ + wrapper.or().eq("host_id",1); + }else if (getRole().getId()==2){ + wrapper.eq("dept_id",getDeptId()); + }else { + wrapper.eq("user_id", getUserId()); + } } if (signHostId){ wrapper.or().eq("host_id",1); @@ -161,6 +175,8 @@ //妯℃澘 priQuote.setTemplate(map.get("template").toString()); + priQuote.setPlanId(priOnline2.getPlanId()); + //璁剧疆椤圭洰娴佺▼ @@ -172,7 +188,7 @@ try{ manager = userService.getDeptManager(getHostId(), userUp.getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗 }catch (Exception e){ - manager = getUser(); + manager = userUp; } priQuote.setMemberId(manager.getId()); ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 2).eq("process", "3-1"));//2锛氭姤浠锋祦绋� @@ -474,7 +490,11 @@ break; case 2: dto.setCurr(Boolean.TRUE); - dto.setMsg("閮ㄩ棬缁忕悊" + manager.getNickname() + "瀹℃壒閫氳繃"); + 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(new Date())); break; default: @@ -493,6 +513,9 @@ if (!priQuoteService.updateById(priQuote)) { throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠$悊鍛�"); + } + if (!smsCodeService.sendSmsCodeText(planLeader.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E,getUserId())) { + return R.ok("瀹℃壒鎴愬姛浣嗙煭淇″彂閫佸け璐�!"); } } else { @@ -518,7 +541,11 @@ break; case 3: dto.setCurr(Boolean.TRUE); - dto.setMsg("鎬昏鍔�" + planLeader.getNickname() + "瀹℃壒閫氳繃"); + if (Cools.isEmpty(dto.getMsg())){ + dto.setMsg("鎬昏鍔�" + planLeader.getNickname() + "瀹℃壒閫氳繃"); + }else { + dto.setMsg(dto.getMsg()+PZH+DateUtils.convert(new Date())+" "+"鎬荤粡鍔�" + planLeader.getNickname() + "瀹℃壒閫氳繃"); + } dto.setTime(DateUtils.convert(new Date())); break; default: @@ -534,6 +561,10 @@ if (!priQuoteService.updateById(priQuote)) { throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠$悊鍛�"); + } + User phoneUser = userService.selectById(priQuote.getUserId()); + if (!smsCodeService.sendSmsCodeText(phoneUser.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E,getUserId())) { + return R.ok("瀹℃壒鎴愬姛浣嗙煭淇″彂閫佸け璐�!"); } break; case 3: @@ -551,7 +582,11 @@ break; case 4: dto.setCurr(Boolean.TRUE); - dto.setMsg("涓氬姟鍛�" + salesman0.getNickname() + "瀹℃壒閫氳繃"); + if (Cools.isEmpty(dto.getMsg())){ + dto.setMsg("涓氬姟鍛�" + salesman0.getNickname() + "瀹℃壒閫氳繃"); + }else { + dto.setMsg(dto.getMsg()+PZH+DateUtils.convert(new Date())+" "+"涓氬姟鍛�" + salesman0.getNickname() + "瀹℃壒閫氳繃"); + } dto.setTime(DateUtils.convert(new Date())); break; default: @@ -578,119 +613,44 @@ @ManagerAuth public R refusePriQuote(@RequestParam Long planId, @RequestParam(required = false) Long plannerId){ -// PriQuote priQuote = priQuoteService.selectById(planId); -// assert priQuote != null; -// -// switch (priQuote.getSettle()) { -// case 1: -// // 鏈儴闂ㄧ粡鐞嗗鏍� -// User user = userService.selectById(priQuote.getUserId()); -// User manager = userService.getDeptManager(getHostId(), user.getDeptId()); -// if (manager.getId().equals(getUserId())) { -// -// // 淇敼 settle 姝ラ鏁版嵁 -// List<SettleDto> list = JSON.parseArray(priQuote.getSettleMsg(), SettleDto.class); -// for (SettleDto dto : list) { -// switch (dto.getStep()) { -// case 1: -// dto.setCurr(Boolean.FALSE); -// break; -// case 2: -// dto.setCurr(Boolean.TRUE); -// dto.setMsg("閮ㄩ棬缁忕悊" + manager.getNickname() + "瀹℃壒閫氳繃"); -// dto.setTime(DateUtils.convert(new Date())); -// break; -// default: -// break; -// } -// } -// priQuote.setSettleMsg(JSON.toJSONString(list)); -// -// // 淇敼瑙勫垝鍗曠姸鎬� -// priQuote.setSettle(2); // 鎬昏鍔炲緟瀹� -// priQuote.setUpdateUserId(getUserId()); -// priQuote.setUpdateTime(new Date()); -// -// if (!priQuoteService.updateById(priQuote)) { -// throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠$悊鍛�"); -// } -// -// } else { -// return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄�"); -// } -// break; -// case 2: -// ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 2).eq("process", "3-1"));//2锛氭姤浠锋祦绋� -// User planLeader = userService.selectById(processPermissions.getUserId()); // 鑾峰彇鎶ヤ环娴佺▼鑺傜偣3纭浜� -// if (Cools.isEmpty(planLeader)) { -// throw new CoolException("鏈煡鎵惧埌鎶ヤ环娴佺▼鑺傜偣3-1纭浜猴紝璇疯仈绯诲湪瀹℃壒鏉冮檺娣诲姞纭浜猴紒"); -// } -// if (!getUserId().equals(planLeader.getId())) { -// return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄�"); -// } -// User planner = userService.selectById(plannerId); -// // 淇敼 settle 姝ラ鏁版嵁 -// List<SettleDto> list = JSON.parseArray(priQuote.getSettleMsg(), SettleDto.class); -// for (SettleDto dto : list) { -// switch (dto.getStep()) { -// case 2: -// dto.setCurr(Boolean.FALSE); -// break; -// case 3: -// dto.setCurr(Boolean.TRUE); -// dto.setMsg("鎬昏鍔�" + planLeader.getNickname() + "瀹℃壒閫氳繃"); -// dto.setTime(DateUtils.convert(new Date())); -// break; -// default: -// break; -// } -// } -// priQuote.setSettleMsg(JSON.toJSONString(list)); -// // 淇敼瑙勫垝鍗曠姸鎬� -// priQuote.setSettle(3); // 瑙勫垝鍛樺緟瀹� -// priQuote.setUpdateUserId(getUserId()); -// priQuote.setUpdateTime(new Date()); -// -// if (!priQuoteService.updateById(priQuote)) { -// throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠$悊鍛�"); -// } -// break; -// case 3: -// // 涓氬姟鍛� -// User salesman0 = userService.selectById(priQuote.getUserId()); -// if (!getUserId().equals(salesman0.getId())) { -// return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄�"); -// } -// // 淇敼 settle 姝ラ鏁版嵁 -// List<SettleDto> list1 = JSON.parseArray(priQuote.getSettleMsg(), SettleDto.class); -// for (SettleDto dto : list1) { -// switch (dto.getStep()) { -// case 3: -// dto.setCurr(Boolean.TRUE); -// break; -// case 4: -// dto.setCurr(Boolean.TRUE); -// dto.setMsg("涓氬姟鍛�" + salesman0.getNickname() + "瀹℃壒閫氳繃"); -// dto.setTime(DateUtils.convert(new Date())); -// break; -// default: -// break; -// } -// } -// priQuote.setSettleMsg(JSON.toJSONString(list1)); -// // 淇敼瑙勫垝鍗曠姸鎬� -// priQuote.setSettle(4); // 瀹℃壒閫氳繃 -// priQuote.setUpdateUserId(getUserId()); -// priQuote.setUpdateTime(new Date()); -// -// if (!priQuoteService.updateById(priQuote)) { -// throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠$悊鍛�"); -// } -// break; -// default: -// return R.error(); -// } - return R.ok("瀹℃壒鎴愬姛"); + + PriQuote priQuote = priQuoteService.selectById(planId); + + Date now = new Date(); + Long memberId = priQuote.getMemberId(); + User member = userService.selectById(memberId); + if (!member.getId().equals(getUserId())){ + return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄�"); + } + List<SettleDto> planDtos = JSON.parseArray(priQuote.getSettleMsg(), SettleDto.class); + List<SettleDto> planDtoList = new ArrayList<>(); + boolean sign = true; + for (SettleDto dto : planDtos) { + if (dto.getStep().equals(2)){ + priQuote.setMemberId(dto.getUserId()); + } + if (sign && dto.getUserId().equals(memberId) && priQuote.getSettle()+1==dto.getStep()){ + if (Cools.isEmpty(dto.getMsg())){ + dto.setMsg(DateUtils.convert(now)+" "+member.getNickname()+"鍥為��瀹℃壒"); + }else { + dto.setMsg(dto.getMsg()+PZH+DateUtils.convert(now)+" "+member.getNickname()+"鍥為��瀹℃壒"); + } + sign = false; + } + if (sign){ + dto.setMsg(dto.getMsg()+PZH+DateUtils.convert(now)+" "+member.getNickname()+"鍥為��瀹℃壒"); + } + + planDtoList.add(dto); + } + + priQuote.setSettle(1); + priQuote.setUpdateUserId(getUserId()); + priQuote.setUpdateTime(now); + + priQuote.setSettleMsg(JSON.toJSONString(planDtoList)); + priQuoteService.updateById(priQuote); + return R.ok("鍥為��鎴愬姛"); } } -- Gitblit v1.9.1