From 3041a7d6dba13e237c4f21d3e46b88c35d376bf3 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 08 九月 2023 10:14:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/entity/Order.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 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 c7c232a..a114a16 100644
--- a/src/main/java/com/zy/crm/manager/entity/Order.java
+++ b/src/main/java/com/zy/crm/manager/entity/Order.java
@@ -138,9 +138,9 @@
private String files;
/**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ * 椤圭洰鐘舵�亄0:璺熻釜涓�,1:瀹屾垚,2:鍏抽棴}
*/
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ @ApiModelProperty(value= "椤圭洰鐘舵�亄0:璺熻釜涓�,1:瀹屾垚,2:鍏抽棴}")
private Integer status;
/**
@@ -173,15 +173,27 @@
@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= "棰勮鎴愪氦鐜�")
+ private String transactionRate;
+
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) {
+ this.id = id;
this.hostId = hostId;
this.deptId = deptId;
this.userId = userId;
@@ -203,7 +215,10 @@
this.createTime = createTime;
this.updateBy = updateBy;
this.updateTime = updateTime;
+ this.step = step;
this.memo = memo;
+ this.transactionRate = transactionRate;
+ this.pcd = pcd;
}
// Order order = new Order(
@@ -288,10 +303,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);
}
@@ -310,7 +327,7 @@
if (Cools.isEmpty(this.createTime)){
return "";
}
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm").format(this.createTime);
}
public String getUpdateBy$(){
@@ -326,7 +343,7 @@
if (Cools.isEmpty(this.updateTime)){
return "";
}
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm").format(this.updateTime);
}
@TableField(exist = false)
--
Gitblit v1.9.1