From 1dcf237ac9fca4a6132b0175c188c44308e7a4f7 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 06 十月 2023 08:32:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/entity/Plan.java | 52 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 41 insertions(+), 11 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..30d3faf 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,18 @@
@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;
+
public Plan() {}
public String getHostId$(){
@@ -298,12 +310,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 +360,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);
@@ -361,6 +381,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