From 46898bbf94063b368d52ac2bd3ba624e4a9f77e6 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 12 九月 2023 17:36:58 +0800
Subject: [PATCH] #bug修复，双红*问题
---
src/main/java/com/zy/crm/manager/entity/Order.java | 42 +++++++++++++++++++++++++++++++++++-------
1 files changed, 35 insertions(+), 7 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 36c4605..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;
@@ -138,9 +139,9 @@
private String files;
/**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ * 椤圭洰鐘舵�亄0:璺熻釜涓�,1:瀹屾垚,2:鍏抽棴}
*/
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ @ApiModelProperty(value= "椤圭洰鐘舵�亄0:璺熻釜涓�,1:瀹屾垚,2:鍏抽棴}")
private Integer status;
/**
@@ -178,16 +179,29 @@
@TableField("step")
private int step;
-
/**
* 娉ㄩ噴
*/
@ApiModelProperty(value= "娉ㄩ噴")
private String memo;
+ /**
+ * 棰勮鎴愪氦鐜�
+ */
+ @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,Integer step,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;
@@ -211,6 +225,9 @@
this.updateTime = updateTime;
this.step = step;
this.memo = memo;
+ this.transactionRate = transactionRate;
+ this.pcd = pcd;
+ this.orderProductTypeId = orderProductTypeId;
}
// Order order = new Order(
@@ -243,6 +260,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;
}
@@ -295,10 +321,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