From 923a4bf299c8ab83a60f86a066c4b0675a0fad4d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期六, 19 十一月 2022 09:24:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/entity/Plan.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 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 f73dec4..142cb76 100644
--- a/src/main/java/com/zy/crm/manager/entity/Plan.java
+++ b/src/main/java/com/zy/crm/manager/entity/Plan.java
@@ -7,6 +7,7 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.crm.manager.service.CstmrService;
+import com.zy.crm.manager.service.OrderService;
import com.zy.crm.manager.service.PlanNeedService;
import com.zy.crm.manager.service.PlanTypeService;
import com.zy.crm.system.entity.Dept;
@@ -113,6 +114,12 @@
private Integer beItem;
/**
+ * 琛ㄥ崟鍐呭
+ */
+ @ApiModelProperty(value= "琛ㄥ崟鍐呭")
+ private String form;
+
+ /**
* 瑙勫垝鍛�
*/
@ApiModelProperty(value= "瑙勫垝鍛�")
@@ -125,12 +132,6 @@
@TableField("finish_time")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date finishTime;
-
- /**
- * 琛ㄥ崟鍐呭
- */
- @ApiModelProperty(value= "琛ㄥ崟鍐呭")
- private String form;
/**
* 鏇存敼鏂规 1: 鏄� 0: 鍚�
@@ -336,10 +337,10 @@
}
public String getOrderId$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.orderId);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
+ OrderService service = SpringUtils.getBean(OrderService.class);
+ Order order = service.selectById(this.orderId);
+ if (!Cools.isEmpty(order)){
+ return String.valueOf(order.getName());
}
return null;
}
--
Gitblit v1.9.1