From a6535d6c9889a4240d037367db3c481a679e15a0 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 10 十月 2023 09:09:54 +0800
Subject: [PATCH] #一键出差、报销完善相关
---
src/main/java/com/zy/crm/manager/controller/PriQuoteController.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 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..8eb339e 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriQuoteController.java
@@ -146,20 +146,22 @@
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);
@@ -168,10 +170,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 +459,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;
}
@@ -481,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());
@@ -523,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