From 133307a0637193ca0c23f468aea2bd91c76e710a Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 08 九月 2023 14:04:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/entity/Contract.java | 27 +++++++++++++++++++++------
1 files changed, 21 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 713659f..22ba587 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;
/**
* 鏇存柊浜哄憳
@@ -172,9 +172,22 @@
@ApiModelProperty(value= "娉曚汉鎴栨巿鏉冧唬琛�")
private String boss;
+ /**
+ * 鍚堝悓缂栧彿
+ */
+ @ApiModelProperty(value= "鍚堝悓缂栧彿")
+ private String serial;
+
+ /**
+ * 閮ㄩ棬ID
+ */
+ @ApiModelProperty(value= "鍒涘缓浜哄憳")
+ @TableField("dept_id")
+ private Long deptId;
+
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) {
+ 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) {
this.id = id;
this.customer = customer;
this.address = address;
@@ -185,7 +198,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;
@@ -198,6 +211,8 @@
this.status = status;
this.memo = memo;
this.boss = boss;
+ this.serial = serial;
+ this.deptId = deptId;
}
// Contract contract = new Contract(
@@ -236,9 +251,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