From 96bea93e9591de5bd6e632b7bf9bb1e920f371ed Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 10 十一月 2023 15:04:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/PriQuoteController.java | 208 ++++++++++++++++++++-------------------------------
1 files changed, 81 insertions(+), 127 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 039af1f..5bbb6fa 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
@@ -55,6 +55,8 @@
@Autowired
private PlanTypeService planTypeService;
+ String PZH=" 鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�� ";
+
@RequestMapping(value = "/priQuote/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
@@ -82,7 +84,7 @@
@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);
@@ -122,7 +124,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);
@@ -146,20 +154,24 @@
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());
+ priQuote.setPlanId(priOnline2.getPlanId());
+
+
//璁剧疆椤圭洰娴佺▼
plan.setStep(5);
@@ -168,10 +180,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();
+ manager = userUp;
}
+ 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 +469,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;
}
@@ -471,7 +484,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:
@@ -481,7 +498,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());
@@ -512,7 +532,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:
@@ -523,6 +547,7 @@
// 淇敼瑙勫垝鍗曠姸鎬�
priQuote.setSettle(3); // 瑙勫垝鍛樺緟瀹�
priQuote.setUpdateUserId(getUserId());
+ priQuote.setMemberId(priQuote.getUserId());
priQuote.setUpdateTime(new Date());
if (!priQuoteService.updateById(priQuote)) {
@@ -544,7 +569,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:
@@ -571,119 +600,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