From 564bf7ab6a639c2c4557d35b8fd9b51dca60a738 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 22 八月 2023 13:32:34 +0800
Subject: [PATCH] #规则完善
---
src/main/java/com/zy/crm/manager/entity/Plan.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
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 25e5a1c..5a0398d 100644
--- a/src/main/java/com/zy/crm/manager/entity/Plan.java
+++ b/src/main/java/com/zy/crm/manager/entity/Plan.java
@@ -234,6 +234,12 @@
@ApiModelProperty(value= "娉ㄩ噴")
private String memo;
+ /**
+ * 椤圭洰杩涘害娴佺▼{1锛氶」鐩垱寤猴紝2锛氭牳浠峰鐞嗭紝3锛氫骇鍝佽垂鐢ㄦ槑缁嗭紝4锛氭姤浠烽绠楀崟锛�5锛氭姤浠峰崟}
+ */
+ @ApiModelProperty(value= "椤圭洰杩涘害娴佺▼{1锛氶」鐩垱寤猴紝2锛氭牳浠峰鐞嗭紝3锛氫骇鍝佽垂鐢ㄦ槑缁嗭紝4锛氭姤浠烽绠楀崟锛�5锛氭姤浠峰崟}")
+ private Integer step;
+
public Plan() {}
public String getHostId$(){
@@ -298,6 +304,9 @@
}
public String getPlanNeed$(){
+ if (Cools.isEmpty(this.planNeed)){
+ return null;
+ }
PlanNeedService service = SpringUtils.getBean(PlanNeedService.class);
String[] planNeeds = this.planNeed.split("-");
String name="";
@@ -346,13 +355,13 @@
if (null == this.settle){ return null; }
switch (this.settle){
case 1:
- return "寮�濮�";
+ return "绛夊緟缁勯暱瀹℃牳";
case 2:
- return "缁勯暱瀹℃牳";
+ return "绛夊緟鍞墠鍒嗛厤瑙勫垝鍛�";
case 3:
- return "鍞墠瀹℃牳";
+ return "绛夊緟瑙勫垝鍛樻彁浜�";
case 4:
- return "瑙勫垝鍛樺鏍�";
+ return "瑙勫垝鍛樺凡鎻愪氦";
case 5:
return "瀹℃壒閫氳繃";
default:
@@ -366,6 +375,16 @@
if (!Cools.isEmpty(user)){
return String.valueOf(user.getNickname());
}
+ return "";
+ }
+
+ public String getNowHeadman$(){
+ PlanTypeService planTypeService = SpringUtils.getBean(PlanTypeService.class);
+ PlanType planType = planTypeService.selectById(this.planType);
+ User user = planTypeService.findPlanLeader(planType);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
return null;
}
--
Gitblit v1.9.1