From ef8f08ff763cae09314fa90e0582f8f120c62ff1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 31 七月 2023 10:51:40 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/entity/Plan.java | 138 ++++++++++++++++-----------------------------
1 files changed, 49 insertions(+), 89 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 355652f..5abbe6b 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;
/**
@@ -103,7 +104,7 @@
*/
@ApiModelProperty(value= "鏂规鎵�闇�")
@TableField("plan_need")
- private Long planNeed;
+ private String planNeed;
/**
* 绔嬮」 1: 鏄� 0: 鍚�
@@ -122,14 +123,14 @@
* 瑙勫垝鍛�
*/
@ApiModelProperty(value= "瑙勫垝鍛�")
- private String planner;
+ private Long planner;
/**
* 瀹屾垚鏃堕棿
*/
@ApiModelProperty(value= "瀹屾垚鏃堕棿")
@TableField("finish_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
private Date finishTime;
/**
@@ -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;
/**
@@ -235,70 +236,6 @@
public Plan() {}
- public Plan(Long hostId,Long deptId,Long planType,Long userId,Long orderId,Long cstmrId,String uuid,String name,Date appleTime,Long planNeed,Integer beItem,String planner,Date finishTime,String form,Integer change,Integer changeTime,String changeReason,Double planBonus,Double planLeaderBonus,String files,Integer settle,String settleMsg,String comment,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
- this.hostId = hostId;
- this.deptId = deptId;
- this.planType = planType;
- this.userId = userId;
- this.orderId = orderId;
- this.cstmrId = cstmrId;
- this.uuid = uuid;
- this.name = name;
- this.appleTime = appleTime;
- this.planNeed = planNeed;
- this.beItem = beItem;
- this.planner = planner;
- this.finishTime = finishTime;
- this.form = form;
- this.change = change;
- this.changeTime = changeTime;
- this.changeReason = changeReason;
- this.planBonus = planBonus;
- this.planLeaderBonus = planLeaderBonus;
- this.files = files;
- this.settle = settle;
- this.settleMsg = settleMsg;
- this.comment = comment;
- this.status = status;
- this.createBy = createBy;
- this.createTime = createTime;
- this.updateBy = updateBy;
- this.updateTime = updateTime;
- this.memo = memo;
- }
-
-// Plan plan = new Plan(
-// null, // 鎵�灞炲晢鎴�
-// null, // 鎵�灞為儴闂�
-// null, // 涓氬姟绫诲瀷[闈炵┖]
-// null, // 涓氬姟鍛�
-// null, // 璺熻釜椤圭洰
-// null, // 鐢叉柟鍗曚綅
-// null, // 瑙勫垝鍗曚唬鍙穂闈炵┖]
-// null, // 瑙勫垝鍗曞悕绉癧闈炵┖]
-// null, // 鐢宠鏃ユ湡
-// null, // 鏂规鎵�闇�
-// null, // 绔嬮」
-// null, // 瑙勫垝鍛�
-// null, // 瀹屾垚鏃堕棿
-// null, // 琛ㄥ崟鍐呭
-// null, // 鏇存敼鏂规
-// null, // 鏇存敼娆℃暟
-// null, // 鏇存敼鏂规鍘熷洜
-// null, // 瑙勬牸濂栭噾
-// null, // 瑙勬牸缁勯暱濂栭噾
-// null, // 闄勪欢
-// null, // 杩涘害
-// null, // 瀹℃牳杩涘害
-// null, // 璇勮
-// null, // 鐘舵��
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null // 娉ㄩ噴
-// );
-
public String getHostId$(){
HostService service = SpringUtils.getBean(HostService.class);
Host host = service.selectById(this.hostId);
@@ -336,10 +273,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,16 +294,24 @@
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$(){
- 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$(){
@@ -385,7 +330,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$(){
@@ -404,24 +349,39 @@
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 "瑙勫垝瀹℃牳";
- case 6:
- return "瀹℃壒涓�";
- case 7:
return "瀹℃壒閫氳繃";
default:
return String.valueOf(this.settle);
}
}
+ public String getPlanner$(){
+ 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());
+ }
+ return null;
+ }
+
public String getStatus$(){
if (null == this.status){ return null; }
switch (this.status){
--
Gitblit v1.9.1