From 419de9e1681475c89356439f30849951af8bb98a Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 14 八月 2023 08:59:49 +0800
Subject: [PATCH] #报价单审核机制
---
src/main/java/com/zy/crm/manager/service/impl/PlanTypeServiceImpl.java | 23 +++
src/main/webapp/static/js/priQuote/priQuote.js | 17 +-
src/main/java/com/zy/crm/common/model/SettleDto.java | 42 +++++++
src/main/java/com/zy/crm/manager/controller/PriQuoteController.java | 210 ++++++++++++++++++++++++++++++++++
src/main/java/com/zy/crm/manager/entity/PriQuote.java | 9 +
src/main/java/com/zy/crm/manager/service/PlanTypeService.java | 2
6 files changed, 290 insertions(+), 13 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 2cb884d..e831c95 100644
--- a/src/main/java/com/zy/crm/common/model/SettleDto.java
+++ b/src/main/java/com/zy/crm/common/model/SettleDto.java
@@ -71,4 +71,46 @@
return list;
}
+ public static List<SettleDto> initPriQuote(Plan plan, User manager) {
+ List<SettleDto> list = new ArrayList<>();
+ for (int i = 1; i < 6; i++) {
+ SettleDto dto = new SettleDto();
+ dto.setStep(i);
+ switch (i) {
+ case 1:
+ dto.setTitle("寮�濮�");
+ dto.setMsg(plan.getUserId$() + "鍒涘缓浜嗗鎵�");
+ dto.setUserId(plan.getUserId());
+ dto.setUsername(plan.getUserId$());
+ dto.setTime(DateUtils.convert(new Date()));
+ dto.setCurr(Boolean.TRUE);
+ list.add(dto);
+ break;
+ case 2:
+ dto.setTitle("閮ㄩ棬缁忕悊瀹℃牳");
+ dto.setUserId(manager.getId());
+ dto.setUsername(manager.getNickname());
+ list.add(dto);
+ break;
+ case 3:
+ dto.setTitle("鎬昏鍔炲鏍�");
+ list.add(dto);
+ break;
+ case 4:
+ dto.setTitle("涓氬姟鍛樺鏍�");
+ list.add(dto);
+ break;
+ case 5:
+ dto.setTitle("瀹℃壒閫氳繃");
+ dto.setUserId(plan.getUserId());
+ dto.setUsername(plan.getUserId$());
+ list.add(dto);
+ break;
+ default:
+ break;
+ }
+ }
+ return list;
+ }
+
}
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 f261d0b..002ed96 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
@@ -12,13 +12,11 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.domain.KeyValueVo;
+import com.core.exception.CoolException;
import com.zy.crm.common.model.SettleDto;
import com.zy.crm.common.web.BaseController;
import com.zy.crm.manager.entity.*;
-import com.zy.crm.manager.service.ItemService;
-import com.zy.crm.manager.service.PlanService;
-import com.zy.crm.manager.service.PriQuoteBudgetService;
-import com.zy.crm.manager.service.PriQuoteService;
+import com.zy.crm.manager.service.*;
import com.zy.crm.system.entity.User;
import com.zy.crm.system.service.UserService;
import org.apache.poi.xssf.usermodel.XSSFSheet;
@@ -47,6 +45,9 @@
@Autowired
private PriQuoteBudgetService priQuoteBudgetService;
+
+ @Autowired
+ private PlanTypeService planTypeService;
@RequestMapping(value = "/priQuote/{id}/auth")
@ManagerAuth
@@ -147,7 +148,7 @@
priQuote.setForm(JSON.toJSONString(map)); // 鑷畾涔夎〃鍗曞唴瀹�
priQuote.setSettle(1); // 1.寮�濮�
User manager = userService.getDeptManager(getHostId(), getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
- priQuote.setSettleMsg(JSON.toJSONString(SettleDto.init(plan, manager)));
+ priQuote.setSettleMsg(JSON.toJSONString(SettleDto.initPriQuote(plan, manager)));
planService.updateById(plan);
@@ -416,4 +417,203 @@
}
}
+ @PostMapping(value = "/priQuote/approval/auth")
+ @ManagerAuth
+ public R approvalPriQuote(@RequestParam Long planId,
+ @RequestParam(required = false) Long plannerId){return null;}
+// 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())) {
+//
+//
+// // 鏌ユ壘鎬昏鍔�
+// PlanType planType = planTypeService.selectById(priQuote.getPlanType());
+// User planLeader = planTypeService.findPlanLeader(planType);
+// if (Cools.isEmpty(planLeader)) {
+// throw new CoolException("鏈煡鎵惧埌鎬昏鍔烇紝璇疯仈绯荤鐞嗗憳");
+// }
+//
+// // 淇敼 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;
+// case 3:
+// dto.setUserId(planLeader.getId());
+// dto.setUsername(planLeader.getNickname());
+// 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("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
+// }
+//
+// // 娣诲姞瑙勫垝缁勯暱璺熻繘浜�
+// PlanFoll planFoll = new PlanFoll();
+// planFoll.setPlanId(priQuote.getId());
+// planFoll.setUserId(planLeader.getId());
+// if (!planFollService.insert(planFoll)) {
+// throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
+// }
+//
+// } else {
+// return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄�");
+// }
+// break;
+// case 2:
+// // 鏌ユ壘瑙勫垝缁勯暱
+// PlanType planType = planTypeService.selectById(priQuote.getPlanType());
+// User planLeader = planTypeService.findPlanLeader(planType);
+// if (Cools.isEmpty(planLeader)) {
+// throw new CoolException("鏈煡鎵惧埌瑙勫垝缁勯暱锛岃鑱旂郴绠＄悊鍛�");
+// }
+// if (Cools.isEmpty(planLeader)) {
+// throw new CoolException("鏈煡鎵惧埌瑙勫垝缁勯暱锛岃鑱旂郴绠＄悊鍛�");
+// }
+// if (!getUserId().equals(planLeader.getId())) {
+// return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄�");
+// }
+// if (Cools.isEmpty(plannerId)) {
+// 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;
+// case 4:
+// dto.setUserId(planner.getId());
+// dto.setUsername(planner.getNickname());
+// break;
+// default:
+// break;
+// }
+// }
+// priQuote.setSettleMsg(JSON.toJSONString(list));
+// // 淇敼瑙勫垝鍗曠姸鎬�
+// priQuote.setSettle(3); // 瑙勫垝鍛樺緟瀹�
+// priQuote.setPlanner(planner.getId());
+// priQuote.setUpdateUserId(getUserId());
+// priQuote.setUpdateTime(new Date());
+//
+// if (!priQuoteService.updateById(priQuote)) {
+// throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
+// }
+//
+// // 娣诲姞瑙勫垝鍛樿窡杩涗汉
+// PlanFoll planFoll = new PlanFoll();
+// planFoll.setPlanId(priQuote.getId());
+// planFoll.setUserId(planner.getId());
+// if (!planFollService.insert(planFoll)) {
+// throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
+// }
+// break;
+// case 3:
+// User plannerUser = userService.selectById(priQuote.getPlanner());
+// if (Cools.isEmpty(plannerUser)) {
+// return R.error("鏈壘鍒拌鍒掑憳");
+// }
+// if (!getUserId().equals(plannerUser.getId())) {
+// return R.error("鎶辨瓑锛屾偍娌℃湁瀹℃牳鐨勬潈闄�");
+// }
+// // 涓氬姟鍛�
+// User salesman = userService.selectById(priQuote.getUserId());
+// // 淇敼 settle 姝ラ鏁版嵁
+// List<SettleDto> list0 = JSON.parseArray(priQuote.getSettleMsg(), SettleDto.class);
+// for (SettleDto dto : list0) {
+// switch (dto.getStep()) {
+// case 3:
+// dto.setCurr(Boolean.FALSE);
+// break;
+// case 4:
+// dto.setCurr(Boolean.TRUE);
+// dto.setMsg("瑙勫垝鍛�" + plannerUser.getNickname() + "瀹℃壒閫氳繃");
+// dto.setTime(DateUtils.convert(new Date()));
+// break;
+// case 5:
+// dto.setUserId(salesman.getId());
+// dto.setUsername(salesman.getNickname());
+// break;
+// default:
+// break;
+// }
+// }
+// priQuote.setSettleMsg(JSON.toJSONString(list0));
+// // 淇敼瑙勫垝鍗曠姸鎬�
+// priQuote.setSettle(4); // 瀹℃壒閫氳繃
+// priQuote.setUpdateUserId(getUserId());
+// priQuote.setUpdateTime(new Date());
+//
+// if (!planService.updateById(priQuote)) {
+// throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
+// }
+// break;
+// case 4:
+// // 涓氬姟鍛�
+// 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 4:
+// dto.setCurr(Boolean.TRUE);
+// break;
+// case 5:
+// dto.setCurr(Boolean.TRUE);
+// dto.setMsg("涓氬姟鍛�" + salesman0.getNickname() + "瀹℃壒閫氳繃");
+// dto.setTime(DateUtils.convert(new Date()));
+// break;
+// default:
+// break;
+// }
+// }
+// priQuote.setSettleMsg(JSON.toJSONString(list1));
+// // 淇敼瑙勫垝鍗曠姸鎬�
+// priQuote.setSettle(5); // 瀹℃壒閫氳繃
+// priQuote.setUpdateUserId(getUserId());
+// priQuote.setUpdateTime(new Date());
+//
+// if (!planService.updateById(priQuote)) {
+// throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
+// }
+// break;
+// default:
+// return R.error();
+// }
+// return R.ok("瀹℃壒鎴愬姛");
+// }
+
}
diff --git a/src/main/java/com/zy/crm/manager/entity/PriQuote.java b/src/main/java/com/zy/crm/manager/entity/PriQuote.java
index 51de661..24e640d 100644
--- a/src/main/java/com/zy/crm/manager/entity/PriQuote.java
+++ b/src/main/java/com/zy/crm/manager/entity/PriQuote.java
@@ -148,6 +148,15 @@
return null;
}
+ public String getPlanName$() {
+ PlanService planService = SpringUtils.getBean(PlanService.class);
+ Plan plan = planService.selectById(this.itemId);
+ if (!Cools.isEmpty(plan)){
+ return String.valueOf(plan.getName());
+ }
+ return null;
+ }
+
public String getUpdateTime$(){
if (Cools.isEmpty(this.updateTime)){
return "";
diff --git a/src/main/java/com/zy/crm/manager/service/PlanTypeService.java b/src/main/java/com/zy/crm/manager/service/PlanTypeService.java
index f1afb43..7930c73 100644
--- a/src/main/java/com/zy/crm/manager/service/PlanTypeService.java
+++ b/src/main/java/com/zy/crm/manager/service/PlanTypeService.java
@@ -8,4 +8,6 @@
User findPlanLeader(PlanType planType);
+ User findPriQuoteLeader(PlanType planType);
+
}
diff --git a/src/main/java/com/zy/crm/manager/service/impl/PlanTypeServiceImpl.java b/src/main/java/com/zy/crm/manager/service/impl/PlanTypeServiceImpl.java
index a7ff05d..a4815fa 100644
--- a/src/main/java/com/zy/crm/manager/service/impl/PlanTypeServiceImpl.java
+++ b/src/main/java/com/zy/crm/manager/service/impl/PlanTypeServiceImpl.java
@@ -45,4 +45,27 @@
}
}
+ @Override
+ public User findPriQuoteLeader(PlanType planType) {
+ Dept dept;
+ switch (planType.getType()) {
+ // 璐ф灦
+ case 1:
+ dept = deptService.selectOne(new EntityWrapper<Dept>().eq("memo", "璐ф灦"));
+ if (Cools.isEmpty(dept)) {
+ throw new CoolException("鏈煡鎵惧埌璐ф灦瑙勫垝閮�");
+ }
+ return userService.getDeptManager(planType.getHostId(), dept.getId());
+ // 闆嗘垚
+ case 2:
+ dept = deptService.selectOne(new EntityWrapper<Dept>().eq("memo", "闆嗘垚"));
+ if (Cools.isEmpty(dept)) {
+ throw new CoolException("鏈煡鎵惧埌闆嗘垚瑙勫垝閮�");
+ }
+ return userService.getDeptManager(planType.getHostId(), dept.getId());
+ default:
+ return null;
+ }
+ }
+
}
diff --git a/src/main/webapp/static/js/priQuote/priQuote.js b/src/main/webapp/static/js/priQuote/priQuote.js
index 4f0ea29..8be305b 100644
--- a/src/main/webapp/static/js/priQuote/priQuote.js
+++ b/src/main/webapp/static/js/priQuote/priQuote.js
@@ -90,14 +90,15 @@
{type: 'checkbox', fixed: 'left'}
,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
,{field: 'templateName', align: 'center',title: '妯℃澘鍚�', width: 220, style: 'color: #1890ff;cursor:pointer', event: 'more',hide: false}
- ,{field: 'orderNum', align: 'center',title: '鎶ヤ环棰勭畻鍗曞彿'}
- ,{field: 'inOrderNum', align: 'center',title: '鎶ヤ环缂栧彿'}
- ,{field: 'planId$', align: 'center',title: '瑙勫垝鍗曞彿'}
- ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
- ,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿'}
- ,{field: 'memberId$', align: 'center',title: '涓氬姟鍛�'}
- ,{field: 'userId$', align: 'center',title: '鍒涘缓浜哄憳'}
- ,{field: 'updateUserId$', align: 'center',title: '鏇存柊浜哄憳'}
+ ,{field: 'orderNum', align: 'center',title: '鎶ヤ环棰勭畻鍗曞彿',hide: false}
+ ,{field: 'inOrderNum', align: 'center',title: '鎶ヤ环缂栧彿',hide: false}
+ ,{field: 'planId$', align: 'center',title: '瑙勫垝鍗曞彿',hide: false}
+ ,{field: 'planName$', align: 'center',title: '瑙勫垝鍗曞悕绉�',hide: false}
+ ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿',hide: false}
+ ,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿',hide: false}
+ ,{field: 'memberId$', align: 'center',title: '涓氬姟鍛�',hide: false}
+ ,{field: 'userId$', align: 'center',title: '鍒涘缓浜哄憳',hide: true}
+ ,{field: 'updateUserId$', align: 'center',title: '鏇存柊浜哄憳',hide: false}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:200}
]],
request: {
--
Gitblit v1.9.1