From de07d16d483d1d2fc6f3dd238829979ab3c5e161 Mon Sep 17 00:00:00 2001 From: LSH Date: 星期三, 16 八月 2023 13:48:00 +0800 Subject: [PATCH] #报价完善 --- src/main/java/com/zy/crm/common/model/SettleDto.java | 18 ++++++++++-------- 1 files changed, 10 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..83c2e68 100644 --- a/src/main/java/com/zy/crm/common/model/SettleDto.java +++ b/src/main/java/com/zy/crm/common/model/SettleDto.java @@ -71,7 +71,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 +79,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 +94,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$()); -- Gitblit v1.9.1