From 2a8710c50e2f7c4dd0e333dcf650a2dff960fff4 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 14 九月 2023 12:46:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/java/com/zy/crm/manager/entity/PriQuoteBudget.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 50 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/entity/PriQuoteBudget.java b/src/main/java/com/zy/crm/manager/entity/PriQuoteBudget.java
index c6cbb8d..f362af7 100644
--- a/src/main/java/com/zy/crm/manager/entity/PriQuoteBudget.java
+++ b/src/main/java/com/zy/crm/manager/entity/PriQuoteBudget.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;
@@ -86,9 +87,33 @@
@TableField("member_id")
private Long memberId;
+ @ApiModelProperty(value= "涓婄骇id")
+ @TableField("pri_sales_id")
+ private Long priSalesId;
+
@ApiModelProperty(value= "鍒涘缓閮ㄩ棬")
@TableField("dept_id")
private Long deptId;
+
+ /**
+ * hostId
+ */
+ @ApiModelProperty(value= "hostId")
+ @TableField("host_id")
+ private Long hostId;
+
+ /**
+ * 杩涘害
+ */
+ @ApiModelProperty(value= "杩涘害")
+ private Integer settle;
+
+ /**
+ * 娴佺▼杩涘害
+ */
+ @ApiModelProperty(value= "娴佺▼杩涘害")
+ @TableField("settle_msg")
+ private String settleMsg;
public PriQuoteBudget() {}
@@ -99,6 +124,31 @@
this.filepath = filepath;
}
+ public String getSettle$(){
+ if (null == this.settle){ return null; }
+ switch (this.settle){
+ case 0:
+ return "绛夊緟鎻愪氦";
+ case 1:
+ return "绛夊緟瀹℃壒";
+ case 2:
+ return "绛夊緟纭";
+ case 3:
+ return "瀹℃壒閫氳繃";
+ default:
+ return String.valueOf(this.settle);
+ }
+ }
+
+ public Long getCstmrId$(){
+ CstmrService cstmrService = SpringUtils.getBean(CstmrService.class);
+ Cstmr cstmr = cstmrService.selectByName(1L, this.templateName);
+ if (!Cools.isEmpty(cstmr)){
+ return cstmr.getId();
+ }
+ return 0L;
+ }
+
public String getCreateTime$(){
if (Cools.isEmpty(this.createTime)){
return "";
--
Gitblit v1.9.1