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/Equipment.java | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java index 604e31b..06619c1 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java @@ -297,5 +297,20 @@ private List<EquipmentProcessParameters> processEditTableList; @TableField(exist = false) private List<EquipmentPrecisionParameters> precisionEditTableList; + @Dict(dicCode = "id",dictTable = "mom_base_factory_model",dicText = "name") + @Excel(width = 15,dicCode = "id",dictTable = "mom_base_factory_model",dicText = "name",orderNum = "39", name = "杞﹂棿") + private String factoryModelId; + @Excel(width = 15,dicCode = "id",dictTable = "mom_base_work_center",dicText = "name",name = "浜х嚎",orderNum = "40") + @Dict(dicCode = "id",dictTable = "mom_base_work_center",dicText = "name") + private String workCenterId; + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @Excel(name = "璐ㄤ繚寮�濮嬫棩鏈�", width = 15,orderNum = "37",format = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date warrantyStart; + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @Excel(name = "璐ㄤ繚缁撴潫鏃ユ湡", width = 15,orderNum = "38",format = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date warrantyEnd; + } -- Gitblit v1.9.3