From 2a08b97f0aad3af5d981a722efb218fb201f821f Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 10 十一月 2023 11:23:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/entity/Order.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/entity/Order.java b/src/main/java/com/zy/crm/manager/entity/Order.java
index a114a16..33fe0a3 100644
--- a/src/main/java/com/zy/crm/manager/entity/Order.java
+++ b/src/main/java/com/zy/crm/manager/entity/Order.java
@@ -8,6 +8,7 @@
import com.core.common.SpringUtils;
import com.zy.crm.manager.service.CompanyService;
import com.zy.crm.manager.service.CstmrService;
+import com.zy.crm.manager.service.OrderProductTypeService;
import com.zy.crm.system.entity.Dept;
import com.zy.crm.system.entity.Dic;
import com.zy.crm.system.entity.Host;
@@ -183,6 +184,12 @@
*/
@ApiModelProperty(value= "娉ㄩ噴")
private String memo;
+ /**
+ * 娉ㄩ噴
+ */
+ @ApiModelProperty(value= "蹇冨緱浣撲細")
+ @TableField("memo_experience")
+ private String memoExperience;
/**
* 棰勮鎴愪氦鐜�
@@ -190,9 +197,16 @@
@ApiModelProperty(value= "棰勮鎴愪氦鐜�")
private String transactionRate;
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "浜у搧绫诲瀷")
+ @TableField("order_product_type_id")
+ private Long orderProductTypeId;
+
public Order() {}
- public Order(Long id, Long hostId, Long deptId, Long userId, Long cstmrId, String uuid, String name, Double money, Long company, String remarks, Long director, String province, String city, String district, String town, String addr, String files, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, int step, String memo, String transactionRate, String pcd) {
+ public Order(Long id, Long hostId, Long deptId, Long userId, Long cstmrId, String uuid, String name, Double money, Long company, String remarks, Long director, String province, String city, String district, String town, String addr, String files, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, int step, String memo, String transactionRate, String pcd,Long orderProductTypeId) {
this.id = id;
this.hostId = hostId;
this.deptId = deptId;
@@ -219,6 +233,7 @@
this.memo = memo;
this.transactionRate = transactionRate;
this.pcd = pcd;
+ this.orderProductTypeId = orderProductTypeId;
}
// Order order = new Order(
@@ -255,6 +270,15 @@
return null;
}
+ public String getOrderProductTypeId$(){
+ OrderProductTypeService orderProductTypeService = SpringUtils.getBean(OrderProductTypeService.class);
+ OrderProductType orderProductType = orderProductTypeService.selectById(this.orderProductTypeId);
+ if (!Cools.isEmpty(orderProductType)){
+ return String.valueOf(orderProductType.getName());
+ }
+ return null;
+ }
+
public String getDeptId$(){
DeptService service = SpringUtils.getBean(DeptService.class);
Dept dept = service.selectById(this.deptId);
--
Gitblit v1.9.1