From e117fad8350939e70c8448ab069c92fa21145c24 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 24 十一月 2022 15:25:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/PlanController.java | 2 ++
src/main/java/com/zy/crm/common/model/SettleDto.java | 8 ++++++--
src/main/java/com/zy/crm/manager/entity/Plan.java | 8 +++++---
3 files changed, 13 insertions(+), 5 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 07cc836..d01cd90 100644
--- a/src/main/java/com/zy/crm/common/model/SettleDto.java
+++ b/src/main/java/com/zy/crm/common/model/SettleDto.java
@@ -30,7 +30,7 @@
public static List<SettleDto> init(Plan plan) {
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) {
@@ -48,10 +48,14 @@
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("瀹℃壒閫氳繃");
list.add(dto);
break;
diff --git a/src/main/java/com/zy/crm/manager/controller/PlanController.java b/src/main/java/com/zy/crm/manager/controller/PlanController.java
index 9a5169e..3e4bb07 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -308,6 +308,8 @@
case 3:
return 4;
case 4:
+ return 5;
+ case 5:
return 0;
default:
return 1;
diff --git a/src/main/java/com/zy/crm/manager/entity/Plan.java b/src/main/java/com/zy/crm/manager/entity/Plan.java
index a0d5a6c..0fb2365 100644
--- a/src/main/java/com/zy/crm/manager/entity/Plan.java
+++ b/src/main/java/com/zy/crm/manager/entity/Plan.java
@@ -174,9 +174,9 @@
private String files;
/**
- * 杩涘害 杩涘害 1: 寮�濮� 2: 缁勯暱瀹℃牳 3: 瑙勫垝瀹℃牳 4: 瀹℃壒閫氳繃
+ * 杩涘害 1: 寮�濮� 2: 缁勯暱瀹℃牳 3: 鍞墠缁勯暱瀹℃牳 4: 瑙勫垝鍛樺鏍� 5: 瀹℃壒閫氳繃
*/
- @ApiModelProperty(value= "杩涘害 1: 寮�濮� 2: 缁勯暱瀹℃牳 3: 瑙勫垝瀹℃牳 4: 瀹℃壒閫氳繃 ")
+ @ApiModelProperty(value= "杩涘害 1: 寮�濮� 2: 缁勯暱瀹℃牳 3: 鍞墠缁勯暱瀹℃牳 4: 瑙勫垝鍛樺鏍� 5: 瀹℃壒閫氳繃 ")
private Integer settle;
/**
@@ -409,8 +409,10 @@
case 2:
return "缁勯暱瀹℃牳";
case 3:
- return "瑙勫垝瀹℃牳";
+ return "鍞墠缁勯暱瀹℃牳";
case 4:
+ return "瑙勫垝鍛樺鏍�";
+ case 5:
return "瀹℃壒閫氳繃";
default:
return String.valueOf(this.settle);
--
Gitblit v1.9.1