From 8f72ae1eb5ad67d16c176ae6d75892303821b9ba Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 23 八月 2023 09:11:56 +0800
Subject: [PATCH] #报销审核完善
---
src/main/java/com/zy/crm/common/model/SettleDto.java | 81 ++++++++++++++++++++++++++++++++++++----
1 files changed, 73 insertions(+), 8 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 e831c95..240f573 100644
--- a/src/main/java/com/zy/crm/common/model/SettleDto.java
+++ b/src/main/java/com/zy/crm/common/model/SettleDto.java
@@ -2,6 +2,7 @@
import com.core.common.DateUtils;
import com.zy.crm.manager.entity.Plan;
+import com.zy.crm.manager.entity.ReimburseOnline;
import com.zy.crm.system.entity.User;
import lombok.Data;
@@ -71,7 +72,7 @@
return list;
}
- public static List<SettleDto> initPriQuote(Plan plan, User manager) {
+ public static List<SettleDto> initPriQuote(Plan plan, User manager ,User president,User user) {
List<SettleDto> list = new ArrayList<>();
for (int i = 1; i < 6; i++) {
SettleDto dto = new SettleDto();
@@ -79,9 +80,9 @@
switch (i) {
case 1:
dto.setTitle("寮�濮�");
- dto.setMsg(plan.getUserId$() + "鍒涘缓浜嗗鎵�");
- dto.setUserId(plan.getUserId());
- dto.setUsername(plan.getUserId$());
+ dto.setMsg(user.getUsername() + "鍒涘缓浜嗗鎵�");
+ dto.setUserId(user.getId());
+ dto.setUsername(user.getUsername());
dto.setTime(DateUtils.convert(new Date()));
dto.setCurr(Boolean.TRUE);
list.add(dto);
@@ -94,13 +95,15 @@
break;
case 3:
dto.setTitle("鎬昏鍔炲鏍�");
+ dto.setUserId(president.getId());
+ dto.setUsername(president.getNickname());
list.add(dto);
break;
+// case 4:
+// 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$());
@@ -113,4 +116,66 @@
return list;
}
+ public static List<SettleDto> initPriQuote(ReimburseOnline reimburseOnline, User manager , User president3, User president4,User president5,User president6,User user) {
+ List<SettleDto> list = new ArrayList<>();
+ for (int i = 0; i < 7; i++) {
+ SettleDto dto = new SettleDto();
+ dto.setStep(i);
+ switch (i) {
+ case 0:
+ dto.setTitle("寮�濮�");
+ dto.setMsg(user.getUsername() + "鍒涘缓浜嗗鎵�");
+ dto.setUserId(user.getId());
+ dto.setUsername(user.getUsername());
+ dto.setTime(DateUtils.convert(new Date()));
+ dto.setCurr(Boolean.TRUE);
+ list.add(dto);
+ break;
+ case 1:
+ dto.setTitle("鎻愪氦鎶ラ攢");
+ dto.setUserId(user.getId());
+ dto.setUsername(user.getNickname());
+ list.add(dto);
+ break;
+ case 2:
+ dto.setTitle("閮ㄩ棬缁忕悊瀹℃牳");
+ dto.setUserId(manager.getId());
+ dto.setUsername(manager.getNickname());
+ list.add(dto);
+ break;
+ case 3:
+ dto.setTitle(president3.getUsername()+"瀹℃牳");
+ dto.setUserId(president3.getId());
+ dto.setUsername(president3.getNickname());
+ list.add(dto);
+ break;
+ case 4:
+ dto.setTitle(president4.getUsername()+"瀹℃牳");
+ dto.setUserId(president4.getId());
+ dto.setUsername(president4.getNickname());
+ list.add(dto);
+ break;
+ case 5:
+ dto.setTitle(president5.getUsername()+"瀹℃牳");
+ dto.setUserId(president5.getId());
+ dto.setUsername(president5.getNickname());
+ list.add(dto);
+ break;
+ case 6:
+ dto.setTitle(president6.getUsername()+"瀹℃牳");
+ dto.setUserId(president6.getId());
+ dto.setUsername(president6.getNickname());
+ list.add(dto);
+ break;
+// case 4:
+// dto.setTitle("涓氬姟鍛樺鏍�");
+// list.add(dto);
+// break;
+ default:
+ break;
+ }
+ }
+ return list;
+ }
+
}
--
Gitblit v1.9.1