From 6630484f4d595c468dba6b07d4586bfbb16525fa Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 12 九月 2023 17:14:19 +0800
Subject: [PATCH] #合同审核完善
---
src/main/java/com/zy/crm/manager/entity/Contract.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/entity/Contract.java b/src/main/java/com/zy/crm/manager/entity/Contract.java
index d52c20e..4e29ce7 100644
--- a/src/main/java/com/zy/crm/manager/entity/Contract.java
+++ b/src/main/java/com/zy/crm/manager/entity/Contract.java
@@ -93,8 +93,8 @@
* 鍒涘缓浜哄憳
*/
@ApiModelProperty(value= "鍒涘缓浜哄憳")
- @TableField("create_by")
- private Long createBy;
+ @TableField("user_id")
+ private Long userId;
/**
* 鏇存柊浜哄憳
@@ -178,9 +178,36 @@
@ApiModelProperty(value= "鍚堝悓缂栧彿")
private String serial;
+ /**
+ * 閮ㄩ棬ID
+ */
+ @ApiModelProperty(value= "鍒涘缓浜哄憳")
+ @TableField("dept_id")
+ private Long deptId;
+
+ /**
+ * hostId
+ */
+ @ApiModelProperty(value= "hostId")
+ @TableField("host_id")
+ private Long hostId;
+
+ /**
+ * 杩涘害
+ */
+ @ApiModelProperty(value= "杩涘害")
+ private Integer settle;
+
+ /**
+ * 娴佺▼杩涘害
+ */
+ @ApiModelProperty(value= "娴佺▼杩涘害")
+ @TableField("settle_msg")
+ private String settleMsg;
+
public Contract() {}
- public Contract(Long id, String customer, String address, String company, String companyAddress, String taxNum, String bank, String bankNum, Date createTime, Date updateTime, Long createBy, Long updateBy, String filepath, String city, String shippingAddress, String shippingName, String shippingPhone, Double price, String email, String name, Integer status, String memo, String boss, String serial) {
+ public Contract(Long id, String customer, String address, String company, String companyAddress, String taxNum, String bank, String bankNum, Date createTime, Date updateTime, Long userId, Long updateBy, String filepath, String city, String shippingAddress, String shippingName, String shippingPhone, Double price, String email, String name, Integer status, String memo, String boss, String serial, Long deptId, Long hostId,Integer settle,String settleMsg) {
this.id = id;
this.customer = customer;
this.address = address;
@@ -191,7 +218,7 @@
this.bankNum = bankNum;
this.createTime = createTime;
this.updateTime = updateTime;
- this.createBy = createBy;
+ this.userId = userId;
this.updateBy = updateBy;
this.filepath = filepath;
this.city = city;
@@ -205,6 +232,10 @@
this.memo = memo;
this.boss = boss;
this.serial = serial;
+ this.deptId = deptId;
+ this.hostId = hostId;
+ this.settle = settle;
+ this.settleMsg = settleMsg;
}
// Contract contract = new Contract(
@@ -229,6 +260,22 @@
// null // 鐢靛瓙閭
// );
+ public String getSettle$(){
+ if (null == this.settle){ return null; }
+ switch (this.settle){
+ case 0:
+ return "绛夊緟鎻愪氦";
+ case 1:
+ return "绛夊緟瀹℃壒";
+ case 2:
+ return "绛夊緟纭";
+ case 3:
+ return "瀹℃壒閫氳繃";
+ default:
+ return String.valueOf(this.settle);
+ }
+ }
+
public String getCreateTime$(){
if (Cools.isEmpty(this.createTime)){
return "";
@@ -243,9 +290,9 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
- public String getCreateBy$() {
+ public String getUserId$() {
UserService userService = SpringUtils.getBean(UserService.class);
- User user = userService.selectById(this.createBy);
+ User user = userService.selectById(this.userId);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getNickname());
}
--
Gitblit v1.9.1