From a96bfff22df5598476f600ffb1d720668f0a2948 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 16 十月 2023 12:45:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/entity/Plan.java | 84 +++++++++++++++++++++++++++++++++++------
1 files changed, 71 insertions(+), 13 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 0514720..4e02dbf 100644
--- a/src/main/java/com/zy/crm/manager/entity/Plan.java
+++ b/src/main/java/com/zy/crm/manager/entity/Plan.java
@@ -104,7 +104,7 @@
*/
@ApiModelProperty(value= "鏂规鎵�闇�")
@TableField("plan_need")
- private Long planNeed;
+ private String planNeed;
/**
* 绔嬮」 1: 鏄� 0: 鍚�
@@ -234,6 +234,24 @@
@ApiModelProperty(value= "娉ㄩ噴")
private String memo;
+ /**
+ * 椤圭洰杩涘害娴佺▼{1锛氶」鐩垱寤猴紝2锛氭牳浠峰鐞嗭紝3锛氫骇鍝佽垂鐢ㄦ槑缁嗭紝4锛氭姤浠烽绠楀崟锛�5锛氭姤浠峰崟}
+ */
+ @ApiModelProperty(value= "椤圭洰杩涘害娴佺▼{1锛氶」鐩垱寤猴紝2锛氭牳浠峰鐞嗭紝3锛氫骇鍝佽垂鐢ㄦ槑缁嗭紝4锛氭姤浠烽绠楀崟锛�5锛氭姤浠峰崟}")
+ private Integer step;
+
+ /**
+ * 涓氬姟鍛樿仈绯绘柟寮�
+ */
+ @ApiModelProperty(value= "涓氬姟鍛樿仈绯绘柟寮�")
+ private String userXmlSelPhone;
+
+ /**
+ * 鑺傜偣璐熻矗浜�
+ */
+ @ApiModelProperty(value= "鑺傜偣璐熻矗浜�")
+ private Long director;
+
public Plan() {}
public String getHostId$(){
@@ -241,6 +259,16 @@
Host host = service.selectById(this.hostId);
if (!Cools.isEmpty(host)){
return String.valueOf(host.getName());
+ }
+ return null;
+ }
+
+ public String getDirector$(){
+ if (this.director==null) return "";
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.director);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
}
return null;
}
@@ -259,6 +287,15 @@
PlanType planType = service.selectById(this.planType);
if (!Cools.isEmpty(planType)){
return String.valueOf(planType.getName());
+ }
+ return null;
+ }
+
+ public Integer getPLType$(){
+ PlanTypeService service = SpringUtils.getBean(PlanTypeService.class);
+ PlanType planType = service.selectById(this.planType);
+ if (!Cools.isEmpty(planType)){
+ return planType.getType();
}
return null;
}
@@ -298,12 +335,20 @@
}
public String getPlanNeed$(){
- PlanNeedService service = SpringUtils.getBean(PlanNeedService.class);
- PlanNeed planNeed = service.selectById(this.planNeed);
- if (!Cools.isEmpty(planNeed)){
- return String.valueOf(planNeed.getName());
+ if (Cools.isEmpty(this.planNeed)){
+ return null;
}
- return null;
+ PlanNeedService service = SpringUtils.getBean(PlanNeedService.class);
+ String[] planNeeds = this.planNeed.split("-");
+ String name="";
+ for (String planNeeda : planNeeds){
+ PlanNeed planNeed = service.selectById(Integer.parseInt(planNeeda));
+ if (!Cools.isEmpty(planNeed)){
+// return String.valueOf(planNeed.getName());
+ name = name+planNeed.getName()+";";
+ }
+ }
+ return name;
}
public String getBeItem$(){
@@ -340,15 +385,15 @@
public String getSettle$(){
if (null == this.settle){ return null; }
switch (this.settle){
+// case 1:
+// return "绛夊緟缁勯暱瀹℃牳";
case 1:
- return "寮�濮�";
+ return "绛夊緟鍞墠鍒嗛厤瑙勫垝鍛�";
case 2:
- return "缁勯暱瀹℃牳";
+ return "绛夊緟瑙勫垝鍛樻彁浜�";
case 3:
- return "鍞墠瀹℃牳";
+ return "瑙勫垝鍛樺凡鎻愪氦";
case 4:
- return "瑙勫垝鍛樺鏍�";
- case 5:
return "瀹℃壒閫氳繃";
default:
return String.valueOf(this.settle);
@@ -356,8 +401,19 @@
}
public String getPlanner$(){
+ if (this.planner==null) return "鏈垎閰�";
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.planner);
+ 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());
}
@@ -367,10 +423,12 @@
public String getStatus$(){
if (null == this.status){ return null; }
switch (this.status){
+ case 2:
+ return "寮�濮嬫牳浠�";
case 1:
- return "姝ｅ父";
+ return "绛夊緟鏍镐环";
case 0:
- return "绂佺敤";
+ return "鏈畬鎴�";
default:
return String.valueOf(this.status);
}
--
Gitblit v1.9.1