From 2656ae9bce8544d81da66c07aaede5386d6fbebb Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 25 七月 2025 15:41:01 +0800
Subject: [PATCH] 1.序列化问题 2.设备领用逻辑优化
---
main-business/src/main/java/com/ruoyi/business/entity/SalesRecord.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/main-business/src/main/java/com/ruoyi/business/entity/SalesRecord.java b/main-business/src/main/java/com/ruoyi/business/entity/SalesRecord.java
index 7f5d55c..809680e 100644
--- a/main-business/src/main/java/com/ruoyi/business/entity/SalesRecord.java
+++ b/main-business/src/main/java/com/ruoyi/business/entity/SalesRecord.java
@@ -4,6 +4,9 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.MyBaseEntity;
import lombok.Data;
@@ -31,6 +34,8 @@
* 閿�鍞棩鏈�
*/
@TableField(value = "sale_date")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "閿�鍞棩鏈�")
private LocalDate saleDate;
/**
* 瀹㈡埛id
@@ -46,12 +51,7 @@
* 鐓ょid
*/
@TableField(value = "coal_id")
- private String coalId;
- /**
- * 鐓ょ
- */
- @TableField(value = "coal")
- private String coal;
+ private Long coalId;
/**
* 鍗曚环锛堝惈绋庯級
*/
@@ -61,7 +61,7 @@
* 搴撳瓨鏁伴噺
*/
@TableField(value = "inventory_quantity")
- private Long inventoryQuantity;
+ private BigDecimal inventoryQuantity;
/**
* 鍗曚綅
*/
@@ -103,6 +103,16 @@
@TableField(value = "net_profit")
private BigDecimal netProfit;
/**
+ * 閲囪喘杩愯垂
+ */
+ @TableField(value = "purchasing_freight")
+ private BigDecimal purchasingFreight;
+ /**
+ * 閿�鍞繍璐�
+ */
+ @TableField(value = "sales_freight")
+ private BigDecimal salesFreight;
+ /**
* 鐧昏浜篿d
*/
@TableField(value = "registrant_id")
@@ -116,5 +126,12 @@
* 鐧昏鏃ユ湡
*/
@TableField(value = "registration_date")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate registrationDate;
+ /**
+ * 鏄惁娣诲姞鑷冲緟琛ュ簱
+ */
+ @TableField(value = "is_add")
+ @JsonProperty("isAdd")
+ private boolean isAdd;
}
\ No newline at end of file
--
Gitblit v1.9.3