From 58f63e3a124680d0b1f571f5d0a1e3ed308d43be Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 20 三月 2026 14:45:34 +0800
Subject: [PATCH] 质押合同页面重构
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutNoticeIn.java | 39 +++++++++++++++++++++------------------
1 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutNoticeIn.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutNoticeIn.java
index 6bff1d3..e083f7b 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutNoticeIn.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutNoticeIn.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fzzy.work.data.WorkStatus;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.persistence.*;
@@ -45,17 +46,13 @@
@TableField("type")
private String type;
- @Column(name = "contract_id", columnDefinition = "varchar(40) COMMENT '鎵�灞炲悎鍚�'")
- @TableField("contract_id")
- private String contractId;
+ @Column(name = "contract", columnDefinition = "varchar(40) COMMENT '鎵�灞炲悎鍚�'")
+ @TableField("contract")
+ private String contract;
@Column(name = "depot_id", columnDefinition = "varchar(40) COMMENT '鍏ュ簱浠撳簱'")
@TableField("depot_id")
private String depotId;
-
- @Column(name = "customer_id", columnDefinition = "varchar(40) COMMENT '鍙戣揣瀹㈡埛'")
- @TableField("customer_id")
- private String customerId;
@Column(name = "customer_name", columnDefinition = "varchar(40) COMMENT '鍙戣揣鍗曚綅'")
@TableField("customer_name")
@@ -69,7 +66,7 @@
@TableField("food_variety")
private String foodVariety;
- @Column(name = "year", columnDefinition = "varchar(4) COMMENT '骞翠唤'")
+ @Column(name = "year", columnDefinition = "varchar(4) COMMENT '绮骞翠唤'")
@TableField("year")
private String year;
@@ -81,18 +78,18 @@
@TableField("complete_number")
private Double completeNumber = 0.0;
- @Column(name = "audit_status", columnDefinition = "varchar(2) COMMENT '瀹℃牳鐘舵��(10=鐩戠瀹℃牳锛�20=閾惰瀹℃牳锛�30=閫氳繃)'")
+ @Column(name = "audit_status", columnDefinition = "varchar(10)")
@TableField("audit_status")
- private String auditStatus = "10";
+ private String auditStatus = WorkStatus.STATUS_10.getCode();
- @Column(name = "audit_user", columnDefinition = "varchar(20) COMMENT '瀹℃牳浜�'")
- @TableField("audit_user")
- private String auditUser;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @Column(name = "audit_date", columnDefinition = "datetime COMMENT '瀹℃壒鏃堕棿'")
- @TableField("audit_date")
- private String auditDate;
+// @Column(name = "audit_user", columnDefinition = "varchar(20) COMMENT '瀹℃牳浜�'")
+// @TableField("audit_user")
+// private String auditUser;
+//
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+// @Column(name = "audit_date", columnDefinition = "datetime COMMENT '瀹℃壒鏃堕棿'")
+// @TableField("audit_date")
+// private Date auditDate;
@Column(name = "complete_status", columnDefinition = "varchar(20) COMMENT '瀹屾垚鐘舵��(NONE=鏈畬鎴愶紝COMPLETE=宸插畬鎴�)'")
@TableField("complete_status")
@@ -103,8 +100,14 @@
@TableField("complete_time")
private Date completeTime;
+ @Column(name = "bank_id", columnDefinition = "varchar(40) COMMENT '鐩戠閾惰'")
+ @TableField("bank_id")
+ private String bankId;
+
@Column(name = "remark", columnDefinition = "varchar(100) COMMENT '澶囨敞璇存槑'")
@TableField("remark")
private String remark;
+
+
}
--
Gitblit v1.9.3