From 46d42b0832edb326b262d1c95c64c17bc0784f30 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@63.com> Date: 星期四, 24 十一月 2022 15:01:01 +0800 Subject: [PATCH] # --- src/main/java/com/zy/crm/manager/controller/PlanController.java | 9 +++------ src/main/java/com/zy/crm/common/model/SettleDto.java | 15 +++------------ src/main/java/com/zy/crm/manager/entity/Plan.java | 14 ++++---------- 3 files changed, 10 insertions(+), 28 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 c59359e..8554c69 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 < 8; i++) { + for (int i = 1; i < 5; i++) { SettleDto dto = new SettleDto(); dto.setStep(i); switch (i) { @@ -44,23 +44,14 @@ list.add(dto); break; case 2: - dto.setTitle("缁勯暱寰呭"); - break; - case 3: dto.setTitle("缁勯暱瀹℃牳"); list.add(dto); break; - case 4: - dto.setTitle("瑙勫垝寰呭"); - break; - case 5: + case 3: dto.setTitle("瑙勫垝瀹℃牳"); list.add(dto); break; - case 6: - dto.setTitle("瀹℃壒涓�"); - break; - case 7: + case 4: 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 87b4172..9a5169e 100644 --- a/src/main/java/com/zy/crm/manager/controller/PlanController.java +++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java @@ -302,15 +302,12 @@ private Integer getStepOfSettle(int settle){ switch (settle){ case 1: - case 2: return 2; - case 3: - case 4: + case 2: return 3; - case 5: - case 6: + case 3: return 4; - case 7: + case 4: 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 606eb5f..a0d5a6c 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: 瑙勫垝寰呭 5: 瑙勫垝瀹℃牳 6: 瀹℃壒涓� 7: 瀹℃壒閫氳繃 + * 杩涘害 杩涘害 1: 寮�濮� 2: 缁勯暱瀹℃牳 3: 瑙勫垝瀹℃牳 4: 瀹℃壒閫氳繃 */ - @ApiModelProperty(value= "杩涘害 1: 寮�濮� 2: 缁勯暱寰呭 3: 缁勯暱瀹℃牳 4: 瑙勫垝寰呭 5: 瑙勫垝瀹℃牳 6: 瀹℃壒涓� 7: 瀹℃壒閫氳繃 ") + @ApiModelProperty(value= "杩涘害 1: 寮�濮� 2: 缁勯暱瀹℃牳 3: 瑙勫垝瀹℃牳 4: 瀹℃壒閫氳繃 ") private Integer settle; /** @@ -407,16 +407,10 @@ case 1: return "寮�濮�"; case 2: - return "缁勯暱寰呭"; - case 3: return "缁勯暱瀹℃牳"; - case 4: - return "瑙勫垝寰呭"; - case 5: + case 3: return "瑙勫垝瀹℃牳"; - case 6: - return "瀹℃壒涓�"; - case 7: + case 4: return "瀹℃壒閫氳繃"; default: return String.valueOf(this.settle); -- Gitblit v1.9.1