From 8b825a12d64065dd9d8054e5247e374f6cec5390 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 06 九月 2023 18:03:30 +0800
Subject: [PATCH] 设备台账字段增加查询条件增加
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java
index 37e981e..1e1ce19 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java
@@ -2,9 +2,11 @@
import lombok.Data;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import java.math.BigDecimal;
+import java.util.Date;
/**
* @author lnl
@@ -63,7 +65,7 @@
@Excel(name = "鍧愭爣鏁伴噺")
private BigDecimal coordinateNum;
- @Excel(name = "璁惧鐘舵��")
+ @Excel(name = "璁惧鐘舵��",dicCode = "equipment_status")
private String equipmentStatus;
@Excel(name = "閲嶉噺")
@@ -108,6 +110,23 @@
@Excel(name = "鎬诲姛鐜�")
private String gpo;
+ @Excel(name = "鎶�鏈姸鎬�",dicCode = "technology_status")
+ private String technologyStatus;
+
+ @Excel(dicCode = "id",dictTable = "mom_base_factory_model",dicText = "name", name = "杞﹂棿")
+ private String factoryModelId;
+
+ @Excel(dicCode = "id",dictTable = "mom_base_work_center",dicText = "name",name = "浜х嚎")
+ private String workCenterId;
+
+ @Excel(name = "璐ㄤ繚寮�濮嬫棩鏈�",format = "yyyyMMdd")
+ private Date warrantyStart;
+
+ @Excel(name = "璐ㄤ繚缁撴潫鏃ユ湡",format = "yyyyMMdd")
+ private Date warrantyEnd;
+
+
+
--
Gitblit v1.9.3