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/InoutRecord.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutRecord.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutRecord.java
index 87918b3..eddfab2 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutRecord.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutRecord.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fzzy.igds.constant.Constant;
+import com.ruoyi.common.annotation.Excel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.persistence.Column;
@@ -33,6 +34,7 @@
public static String SORT_PROP = "id";
@Id
+ @Excel(name = "娴佹按鍙�",sort = 1)
@Column(name = "id", columnDefinition = "varchar(14) COMMENT '娴佹按鍙�'")
@TableField("id")
private String id;
@@ -144,6 +146,8 @@
@Column(name = "full_weight", columnDefinition = "decimal(20,2) COMMENT '婊¤溅绉伴噸(鍗曚綅KG)'")
@TableField("full_weight")
+
+ @Excel(name = "婊¤溅绉伴噸",sort = 2)
private Double fullWeight = 0.0;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -157,6 +161,7 @@
@Column(name = "empty_weight", columnDefinition = "decimal(20,2) COMMENT '绌鸿溅绉伴噸(鍗曚綅KG)'")
@TableField("empty_weight")
+ @Excel(name = "绌鸿溅绉伴噸",sort = 3)
private Double emptyWeight = 0.0;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -170,18 +175,22 @@
@Column(name = "net_weight", columnDefinition = "decimal(20,2) COMMENT '鍑�閲�(鍗曚綅KG)'")
@TableField("net_weight")
+ @Excel(name = "鍑�閲�",sort = 5)
private Double netWeight = 0.0;
@Column(name = "de_other", columnDefinition = "decimal(20,2) COMMENT '鎵ｉ噸(鍗曚綅KG)'")
@TableField("de_other")
+ @Excel(name = "鎵ｉ噸",sort = 4)
private Double deOther = 0.0;
@Column(name = "settle_weight", columnDefinition = "decimal(20,2) COMMENT '缁撶畻閲嶉噺(鍗曚綅KG)'")
@TableField("settle_weight")
+ @Excel(name = "缁撶畻閲嶉噺",sort = 6)
private Double settleWeight = 0.0;
@Column(name = "record_weight", columnDefinition = "decimal(20,2) COMMENT '鍏ュ簱閲嶉噺(鍗曚綅KG)'")
@TableField("record_weight")
+ @Excel(name = "鍏ュ簱閲嶉噺",sort = 7)
private Double recordWeight = 0.0;
@@ -195,10 +204,6 @@
@Column(name = "settle_money", columnDefinition = "decimal(20,2) COMMENT '缁撶畻閲戦(鍗曚綅锛氬厓)'")
@TableField("settle_money")
private Double settleMoney = 0.00;
-
- @Column(name = "settle_id", columnDefinition = "varchar(40) COMMENT '缁撶畻鍗曞彿'")
- @TableField("settle_id")
- private String settleId;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Column(name = "settle_time", columnDefinition = "datetime COMMENT '缁撶畻鏃堕棿'")
@@ -226,10 +231,15 @@
@TableField("complete_user")
private String completeUser;
- @Column(name = "remarks", columnDefinition = "varchar(100) COMMENT '澶囨敞璇存槑'")
+ @Column(name = "remarks", columnDefinition = "varchar(500) COMMENT '澶囨敞璇存槑'")
@TableField("remarks")
private String remarks;
+ @Excel(name = "淇敼璁板綍",sort = 8)
+ @Column(name = "update_log", columnDefinition = "varchar(500) COMMENT '淇敼璁板綍'")
+ @TableField("update_log")
+ private String updateLog;
+
/**
* ----------- 鍊间粨鏃堕棿锛屾墜鏈虹浣跨敤-----------------------
**/
--
Gitblit v1.9.3