From 7dfbe35bfaa7ab48da27073858c64e7602c702dd Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 28 十一月 2022 13:56:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/common/model/SettleDto.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 8554c69..2cb884d 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.system.entity.User;
import lombok.Data;
import java.util.ArrayList;
@@ -26,11 +27,11 @@
private String time;
- private Boolean curr = Boolean.FALSE;
+ private Boolean curr;
- public static List<SettleDto> init(Plan plan) {
+ public static List<SettleDto> init(Plan plan, User manager) {
List<SettleDto> list = new ArrayList<>();
- for (int i = 1; i < 5; i++) {
+ for (int i = 1; i < 6; i++) {
SettleDto dto = new SettleDto();
dto.setStep(i);
switch (i) {
@@ -45,14 +46,22 @@
break;
case 2:
dto.setTitle("缁勯暱瀹℃牳");
+ dto.setUserId(manager.getId());
+ dto.setUsername(manager.getNickname());
list.add(dto);
break;
case 3:
- dto.setTitle("瑙勫垝瀹℃牳");
+ 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:
--
Gitblit v1.9.1