From 7f9d058a0e632be6a3daf6f46d26b69742db0720 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 08 十一月 2023 13:13:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/java/com/zy/crm/manager/entity/PriQuote.java | 44 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/entity/PriQuote.java b/src/main/java/com/zy/crm/manager/entity/PriQuote.java
index 96515e0..7202cc5 100644
--- a/src/main/java/com/zy/crm/manager/entity/PriQuote.java
+++ b/src/main/java/com/zy/crm/manager/entity/PriQuote.java
@@ -6,6 +6,7 @@
import java.util.Date;
import com.core.common.SpringUtils;
+import com.zy.crm.manager.service.CstmrService;
import com.zy.crm.manager.service.ItemService;
import com.zy.crm.manager.service.PlanService;
import com.zy.crm.system.entity.User;
@@ -106,11 +107,37 @@
private Long deptId;
/**
+ * hostId
+ */
+ @ApiModelProperty(value= "hostId")
+ @TableField("host_id")
+ private Long hostId;
+
+ @ApiModelProperty(value= "瑙勫垝鍗旾D")
+ @TableField("plan_id")
+ private Long planId;
+
+ /**
* 瀹℃牳杩涘害
*/
@ApiModelProperty(value= "瀹℃牳杩涘害")
@TableField("settle_msg")
private String settleMsg;
+
+ /**
+ * 妯℃澘
+ */
+ @ApiModelProperty(value= "妯℃澘")
+ @TableField("template")
+ private String template;
+
+ @ApiModelProperty(value= "涓婄骇id")
+ @TableField("pri_quote_budget_id")
+ private Long priQuoteBudgetId;
+
+ @ApiModelProperty(value= "涓婄骇id")
+ @TableField("pri_online_id")
+ private Long priOnlineId;
public PriQuote() {}
@@ -122,15 +149,26 @@
this.settle = settle;
}
+ public Long getCstmrId$(){
+ PlanService planService = SpringUtils.getBean(PlanService.class);
+ Plan plan = planService.selectById(this.itemId);
+ CstmrService cstmrService = SpringUtils.getBean(CstmrService.class);
+ Cstmr cstmr = cstmrService.selectById(plan.getCstmrId());
+ if (!Cools.isEmpty(cstmr)){
+ return cstmr.getId();
+ }
+ return 0L;
+ }
+
public String getSettle$(){
if (null == this.settle){ return null; }
switch (this.settle){
case 1:
- return "绛夊緟缁勯暱瀹℃牳";
- case 2:
return "绛夊緟閮ㄩ棬缁忕悊纭";
+ case 2:
+ return "绛夊緟鎬荤粡鍔炲鏍�";
case 3:
- return "绛夊緟鎬昏鍔炲鏍�";
+ return "绛夊緟涓氬姟鍛樼‘璁�";
case 4:
return "瀹℃壒閫氳繃";
default:
--
Gitblit v1.9.1