From 234fa7f56e0cf3c86dcf56fe0ba628360e1758f4 Mon Sep 17 00:00:00 2001
From: 邱宇豪 <qyh123230312>
Date: 星期四, 26 十月 2023 13:38:01 +0800
Subject: [PATCH] 20231026_qiuyh_调整预埋件导出
---
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/entity/SysEmbedmentRecordEntity.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/entity/SysEmbedmentRecordEntity.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/entity/SysEmbedmentRecordEntity.java
index 152e47b..bfe9790 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/entity/SysEmbedmentRecordEntity.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/entity/SysEmbedmentRecordEntity.java
@@ -2,6 +2,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.thhy.general.annotations.Excel;
+import com.thhy.general.annotations.Idkey;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
@@ -18,6 +19,7 @@
/**
*
*/
+ @Idkey("id")
private String id;
/**
@@ -27,9 +29,10 @@
//预埋件名称
private String embedmentName;
//预埋件规格
+ @Excel(sort = 1,title = "规格型号")
private String embedmentModel;
- @Excel(sort = 1,title = "预埋件名称")
+ @Excel(sort = 0,title = "预埋件名称")
private String embedmentNameAndModel;
public String getEmbedmentNameAndModel() {
@@ -44,7 +47,7 @@
/**
* 出库量/入库量
*/
- @Excel(sort = 2,title = "数量")
+ @Excel(sort = 2,title = "入库数量")
private Integer changeStock;
/**
@@ -88,6 +91,7 @@
/**
* 入库时间
*/
+ @Excel(sort = 6,title = "入库时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String createTime;
--
Gitblit v1.9.3