From 4c33acfe648e9b008f91c5e2cf446550e6b0174d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 22 七月 2025 17:35:57 +0800
Subject: [PATCH] 1.正式库导出优化 2.销售导出 3.设备使用状态优化 4.定时任务优化
---
main-business/src/main/java/com/ruoyi/business/entity/SalesRecord.java | 24 +++++++++++++++++-------
1 files changed, 17 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..b2bb962 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,8 @@
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.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.MyBaseEntity;
import lombok.Data;
@@ -31,6 +33,8 @@
* 閿�鍞棩鏈�
*/
@TableField(value = "sale_date")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "閿�鍞棩鏈�")
private LocalDate saleDate;
/**
* 瀹㈡埛id
@@ -46,12 +50,7 @@
* 鐓ょid
*/
@TableField(value = "coal_id")
- private String coalId;
- /**
- * 鐓ょ
- */
- @TableField(value = "coal")
- private String coal;
+ private Long coalId;
/**
* 鍗曚环锛堝惈绋庯級
*/
@@ -61,7 +60,7 @@
* 搴撳瓨鏁伴噺
*/
@TableField(value = "inventory_quantity")
- private Long inventoryQuantity;
+ private BigDecimal inventoryQuantity;
/**
* 鍗曚綅
*/
@@ -103,6 +102,11 @@
@TableField(value = "net_profit")
private BigDecimal netProfit;
/**
+ * 杩愯垂
+ */
+ @TableField(value = "freight")
+ private BigDecimal freight;
+ /**
* 鐧昏浜篿d
*/
@TableField(value = "registrant_id")
@@ -116,5 +120,11 @@
* 鐧昏鏃ユ湡
*/
@TableField(value = "registration_date")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate registrationDate;
+ /**
+ * 鏄惁娣诲姞鑷冲緟琛ュ簱
+ */
+ @TableField(value = "is_add")
+ private boolean isAdd;
}
\ No newline at end of file
--
Gitblit v1.9.3