From 7b6b97e96af70ea41b86aa7f1e9a134fbef9c8fb Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 23 八月 2023 18:41:57 +0800
Subject: [PATCH] #优化
---
src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java | 55 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java b/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
index 789c294..336ced3 100644
--- a/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
+++ b/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
@@ -158,7 +158,7 @@
reimburseOnline.setCheckData(param.getCheckData());
reimburseOnline.setTemplateName(param.getTemplateName());
- reimburseOnline.setSettle(1); // 1.寮�濮�
+ reimburseOnline.setSettle(0); // 0.鍒涘缓
User manager = userService.getDeptManager(getHostId(), getUser().getDeptId()); // 鑾峰彇閮ㄩ棬棰嗗
ProcessPermissions processPermissions3 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 3).eq("process", param.getCheckData().equals("鍚�")? "3-1" : "3-2"));//3锛氭姤閿�娴佺▼
@@ -182,7 +182,7 @@
map.put("templateName",param.getTemplateName());
map.put("checkData",param.getCheckData());
reimburseOnline.setForm(JSON.toJSONString(map));
- reimburseOnline.setMemberId(manager.getId());
+ reimburseOnline.setMemberId(getUser().getId());
if (!reimburseOnlineService.insert(reimburseOnline)){
return R.error("娣诲姞鎶ラ攢涓绘。澶辫触");
@@ -449,7 +449,45 @@
assert reimburseOnline != null;
Integer settle = reimburseOnline.getSettle();
String process="";
+ Date now = new Date();
switch (reimburseOnline.getSettle()) {
+ case 0:
+ User user2 = userService.selectById(reimburseOnline.getUserId());
+ User manager1 = userService.getDeptManager(getHostId(), user2.getDeptId());
+
+ if (Cools.isEmpty(getUser())) {
+ return R.error("鎶辨瓑锛屾偍娌℃湁鎻愪氦鐨勬潈闄�");
+ }
+ if (!getUserId().equals(getUser().getId())) {
+ return R.error("鎶辨瓑锛屾偍娌℃湁鎻愪氦鐨勬潈闄�");
+ }
+ // 淇敼 settle 姝ラ鏁版嵁
+ List<SettleDto> list1 = JSON.parseArray(reimburseOnline.getSettleMsg(), SettleDto.class);
+ for (SettleDto dto : list1) {
+ switch (dto.getStep()) {
+ case 0:
+ dto.setCurr(Boolean.FALSE);
+ break;
+ case 1:
+ dto.setCurr(Boolean.TRUE);
+ dto.setMsg(getUser().getNickname() + "鎻愪氦瀹屾垚");
+ dto.setTime(DateUtils.convert(now));
+ break;
+ default:
+ break;
+ }
+ }
+ reimburseOnline.setSettleMsg(JSON.toJSONString(list1));
+ // 淇敼瑙勫垝鍗曠姸鎬�
+ reimburseOnline.setSettle(1);
+ reimburseOnline.setUpdateUserId(getUserId());
+ reimburseOnline.setUpdateTime(now);
+ reimburseOnline.setMemberId(manager1.getId());
+
+ if (!reimburseOnlineService.updateById(reimburseOnline)) {
+ throw new CoolException("瀹℃牳澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ break;
case 1:
// 鏈儴闂ㄧ粡鐞嗗鏍�
User user = userService.selectById(reimburseOnline.getUserId());
@@ -466,7 +504,7 @@
case 2:
dto.setCurr(Boolean.TRUE);
dto.setMsg("閮ㄩ棬缁忕悊" + manager.getNickname() + "瀹℃壒閫氳繃");
- dto.setTime(DateUtils.convert(new Date()));
+ dto.setTime(DateUtils.convert(now));
break;
default:
break;
@@ -477,7 +515,7 @@
// 淇敼瑙勫垝鍗曠姸鎬�
reimburseOnline.setSettle(2); // 鎬昏鍔炲緟瀹�
reimburseOnline.setUpdateUserId(getUserId());
- reimburseOnline.setUpdateTime(new Date());
+ reimburseOnline.setUpdateTime(now);
ProcessPermissions processPermissions = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 3).eq("process", reimburseOnline.getCheckData().equals("鍚�") ? "3-1" : "3-2"));//3锛氭姤閿�娴佺▼
reimburseOnline.setMemberId(processPermissions.getUserId());
@@ -521,26 +559,23 @@
for (SettleDto dto : list) {
if (dto.getStep().equals(settle)){
dto.setCurr(Boolean.FALSE);
- break;
}else if (dto.getStep().equals(settle+1)){
dto.setCurr(Boolean.TRUE);
dto.setMsg("鎶ヤ环娴佺▼鑺傜偣"+process+"纭浜�:"+planLeader.getNickname() + "瀹℃壒閫氳繃");
- dto.setTime(DateUtils.convert(new Date()));
- break;
- }else {
- break;
+ dto.setTime(DateUtils.convert(now));
}
}
reimburseOnline.setSettleMsg(JSON.toJSONString(list));
// 淇敼瑙勫垝鍗曠姸鎬�
reimburseOnline.setSettle(settle+1);
reimburseOnline.setUpdateUserId(getUserId());
- reimburseOnline.setUpdateTime(new Date());
+ reimburseOnline.setUpdateTime(now);
String[] split = process.split("-");
if (settle!=5){
settle=settle+2;
}else {
settle++;
+ reimburseOnline.setStatus(1);
}
ProcessPermissions processPermissions2 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 3).eq("process", settle+"-"+split[1]));//3锛氭姤閿�娴佺▼
reimburseOnline.setMemberId(processPermissions2.getUserId());
--
Gitblit v1.9.1