From 1f215fa4138bbc4bbf50846dd507c445615e3b01 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 24 十一月 2022 15:28:59 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/entity/Plan.java | 43 ++++++++++++++++++++-----------------------
1 files changed, 20 insertions(+), 23 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..0fb2365 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;
@@ -95,7 +96,7 @@
*/
@ApiModelProperty(value= "鐢宠鏃ユ湡")
@TableField("apple_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
private Date appleTime;
/**
@@ -113,6 +114,12 @@
private Integer beItem;
/**
+ * 琛ㄥ崟鍐呭
+ */
+ @ApiModelProperty(value= "琛ㄥ崟鍐呭")
+ private String form;
+
+ /**
* 瑙勫垝鍛�
*/
@ApiModelProperty(value= "瑙勫垝鍛�")
@@ -123,14 +130,8 @@
*/
@ApiModelProperty(value= "瀹屾垚鏃堕棿")
@TableField("finish_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
private Date finishTime;
-
- /**
- * 琛ㄥ崟鍐呭
- */
- @ApiModelProperty(value= "琛ㄥ崟鍐呭")
- private String form;
/**
* 鏇存敼鏂规 1: 鏄� 0: 鍚�
@@ -173,9 +174,9 @@
private String files;
/**
- * 杩涘害 1: 寮�濮� 2: 缁勯暱寰呭 3: 缁勯暱瀹℃牳 4: 瑙勫垝寰呭 5: 瑙勫垝瀹℃牳 6: 瀹℃壒涓� 7: 瀹℃壒閫氳繃
+ * 杩涘害 1: 寮�濮� 2: 缁勯暱瀹℃牳 3: 鍞墠缁勯暱瀹℃牳 4: 瑙勫垝鍛樺鏍� 5: 瀹℃壒閫氳繃
*/
- @ApiModelProperty(value= "杩涘害 1: 寮�濮� 2: 缁勯暱寰呭 3: 缁勯暱瀹℃牳 4: 瑙勫垝寰呭 5: 瑙勫垝瀹℃牳 6: 瀹℃壒涓� 7: 瀹℃壒閫氳繃 ")
+ @ApiModelProperty(value= "杩涘害 1: 寮�濮� 2: 缁勯暱瀹℃牳 3: 鍞墠缁勯暱瀹℃牳 4: 瑙勫垝鍛樺鏍� 5: 瀹℃壒閫氳繃 ")
private Integer settle;
/**
@@ -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;
}
@@ -357,7 +358,7 @@
if (Cools.isEmpty(this.appleTime)){
return "";
}
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appleTime);
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.appleTime);
}
public String getPlanNeed$(){
@@ -385,7 +386,7 @@
if (Cools.isEmpty(this.finishTime)){
return "";
}
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.finishTime);
+ return new SimpleDateFormat("yyyy-MM-dd").format(this.finishTime);
}
public String getChange$(){
@@ -406,16 +407,12 @@
case 1:
return "寮�濮�";
case 2:
- return "缁勯暱寰呭";
- case 3:
return "缁勯暱瀹℃牳";
+ case 3:
+ return "鍞墠缁勯暱瀹℃牳";
case 4:
- return "瑙勫垝寰呭";
+ return "瑙勫垝鍛樺鏍�";
case 5:
- return "瑙勫垝瀹℃牳";
- case 6:
- return "瀹℃壒涓�";
- case 7:
return "瀹℃壒閫氳繃";
default:
return String.valueOf(this.settle);
--
Gitblit v1.9.1