From fa3737fbe1a83ccf9e8ad8c6c8e81483f987ab5b Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 08 十一月 2023 13:51:41 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/crm/manager/entity/Order.java |   53 +++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 47 insertions(+), 6 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 218df66..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;
@@ -138,9 +139,9 @@
     private String files;
 
     /**
-     * 鐘舵�� 1: 姝ｅ父  0: 绂佺敤
+     * 椤圭洰鐘舵�亄0:璺熻釜涓�,1:瀹屾垚,2:鍏抽棴}
      */
-    @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父  0: 绂佺敤  ")
+    @ApiModelProperty(value= "椤圭洰鐘舵�亄0:璺熻釜涓�,1:瀹屾垚,2:鍏抽棴}")
     private Integer status;
 
     /**
@@ -173,15 +174,40 @@
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
+
+    @ApiModelProperty(value= "椤圭洰杩涘害娴佺▼{1锛氶」鐩垱寤猴紝2锛氭牳浠峰鐞嗭紝3锛氫骇鍝佽垂鐢ㄦ槑缁嗭紝4锛氭姤浠烽绠楀崟锛�5锛氭姤浠峰崟}")
+    @TableField("step")
+    private int step;
+
     /**
      * 娉ㄩ噴
      */
     @ApiModelProperty(value= "娉ㄩ噴")
     private String memo;
+    /**
+     * 娉ㄩ噴
+     */
+    @ApiModelProperty(value= "蹇冨緱浣撲細")
+    @TableField("memo_experience")
+    private String memoExperience;
+
+    /**
+     * 棰勮鎴愪氦鐜�
+     */
+    @ApiModelProperty(value= "棰勮鎴愪氦鐜�")
+    private String transactionRate;
+
+    /**
+     * 娣诲姞浜哄憳
+     */
+    @ApiModelProperty(value= "浜у搧绫诲瀷")
+    @TableField("order_product_type_id")
+    private Long orderProductTypeId;
 
     public Order() {}
 
-    public Order(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,String memo) {
+    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;
         this.userId = userId;
@@ -203,7 +229,11 @@
         this.createTime = createTime;
         this.updateBy = updateBy;
         this.updateTime = updateTime;
+        this.step = step;
         this.memo = memo;
+        this.transactionRate = transactionRate;
+        this.pcd = pcd;
+        this.orderProductTypeId = orderProductTypeId;
     }
 
 //    Order order = new Order(
@@ -236,6 +266,15 @@
         Host host = service.selectById(this.hostId);
         if (!Cools.isEmpty(host)){
             return String.valueOf(host.getName());
+        }
+        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;
     }
@@ -288,10 +327,12 @@
     public String getStatus$(){
         if (null == this.status){ return null; }
         switch (this.status){
-            case 1:
-                return "姝ｅ父";
             case 0:
-                return "绂佺敤";
+                return "璺熻釜涓�";
+            case 1:
+                return "瀹屾垚";
+            case 2:
+                return "鍏抽棴";
             default:
                 return String.valueOf(this.status);
         }

--
Gitblit v1.9.1