From 64423bf1176b525ce4a182ebb9e6ef6a355d3d74 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期日, 10 九月 2023 20:40:54 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/crm/manager/entity/Order.java |   20 +++++++++++++++++++-
 1 files changed, 19 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..c0814e0 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;
@@ -190,9 +191,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 +227,7 @@
         this.memo = memo;
         this.transactionRate = transactionRate;
         this.pcd = pcd;
+        this.orderProductTypeId = orderProductTypeId;
     }
 
 //    Order order = new Order(
@@ -255,6 +264,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