From 3ac5ee0ef5f6b1ca9537786c4c98556892a2fe4c Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 09 十月 2023 16:27:10 +0800
Subject: [PATCH] #流程相关
---
src/main/java/com/zy/crm/manager/controller/PriQuoteController.java | 55 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 14 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 273923c..8309e79 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
@@ -47,6 +47,9 @@
private PriQuoteBudgetService priQuoteBudgetService;
@Autowired
+ private PriOnline2Service priOnline2Service;
+
+ @Autowired
private ProcessPermissionsService processPermissionsService;
@Autowired
@@ -90,12 +93,15 @@
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- Long deptId = getDeptId();
boolean signUserId = false;
boolean signDeptId = false;
+ boolean signHostId = false;
for (Map.Entry<String, Object> entry : map.entrySet()){
if (entry.getKey().equals("dept_id")){
signDeptId = true;
+ if (String.valueOf(entry.getValue()).equals("19")){
+ signHostId = true;
+ }
}
}
for (Map.Entry<String, Object> entry : map.entrySet()){
@@ -118,45 +124,57 @@
if (!signUserId && !signDeptId){
wrapper.eq("user_id", getUserId());
}
+ if (signHostId){
+ wrapper.or().eq("host_id",1);
+ }
}
@RequestMapping(value = "/priQuote/add/auth")
@ManagerAuth(memo = "娣诲姞鎶ヤ环鍗�")
public R add(@RequestBody Map<String,Object> map) {
- PriQuoteBudget priQuoteBudget = priQuoteBudgetService.selectById(Long.parseLong(map.get("priQuoteBudgetId").toString()));
+// PriQuoteBudget priQuoteBudget = priQuoteBudgetService.selectById(Long.parseLong(map.get("priQuoteBudgetId").toString()));
+ PriOnline2 priOnline2 = priOnline2Service.selectById(Long.parseLong(map.get("priQuoteBudgetId").toString()));
PriQuote priQuote = new PriQuote();
priQuote.setCreateTime(new Date());
priQuote.setTitle(map.get("title").toString());
- priQuote.setTemplateName(priQuoteBudget.getTemplateName());
+ priQuote.setTemplateName(priOnline2.getTemplateName());
priQuote.setSheetData(map.get("sheetData").toString());
- priQuote.setOriQuoteBudgetId(Long.parseLong(map.get("priQuoteBudgetId").toString()));
- priQuote.setItemId(priQuoteBudget.getItemId());
- priQuote.setOrderNum(priQuoteBudget.getInOrderNum());
+ priQuote.setPriOnlineId(Long.parseLong(map.get("priQuoteBudgetId").toString()));
+ priQuote.setItemId(priOnline2.getItemId());
+ priQuote.setOrderNum(priOnline2.getOrderNum());
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());
+
//璁剧疆椤圭洰娴佺▼
plan.setStep(5);
priQuote.setForm(JSON.toJSONString(map)); // 鑷畾涔夎〃鍗曞唴瀹�
priQuote.setSettle(1); // 1.寮�濮�
- User manager = userService.getDeptManager(getHostId(), getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
+ User manager = new User();
+ try{
+ manager = userService.getDeptManager(getHostId(), userUp.getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
+ }catch (Exception e){
+ manager = getUser();
+ }
+ 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())));
@@ -439,7 +457,12 @@
case 1:
// 鏈儴闂ㄧ粡鐞嗗鏍�
User user = userService.selectById(priQuote.getUserId());
- User manager = userService.getDeptManager(getHostId(), user.getDeptId());
+ User manager = new User();
+ try{
+ manager = userService.getDeptManager(getHostId(), user.getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
+ }catch (Exception e){
+ manager = user;
+ }
if (manager.getId().equals(getUserId())) {
// 淇敼 settle 姝ラ鏁版嵁
@@ -461,7 +484,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());
@@ -503,6 +529,7 @@
// 淇敼瑙勫垝鍗曠姸鎬�
priQuote.setSettle(3); // 瑙勫垝鍛樺緟瀹�
priQuote.setUpdateUserId(getUserId());
+ priQuote.setMemberId(priQuote.getUserId());
priQuote.setUpdateTime(new Date());
if (!priQuoteService.updateById(priQuote)) {
--
Gitblit v1.9.1