From b538bc3980de0b31aec6500aa900cac8e39a6be7 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期五, 25 七月 2025 14:40:41 +0800
Subject: [PATCH] 真空热处理炉三保
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceFurnace.java | 43 +++++++++++++++++++++++++++++++++++++------
1 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceFurnace.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceFurnace.java
index f1de276..dfe60ae 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceFurnace.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceFurnace.java
@@ -1,5 +1,7 @@
package org.jeecg.modules.eam.entity;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
@@ -29,7 +31,12 @@
public class EamThirdMaintenanceFurnace extends JeecgEntity implements Serializable {
private static final long serialVersionUID = -5799611070364065336L;
-
+ /**
+ * 澶囨敞
+ */
+ @Excel(name = "澶囨敞", width = 15)
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
/**
* 鍒犻櫎鏍囪
*/
@@ -42,6 +49,19 @@
@Excel(name = "璁惧ID", width = 15)
@ApiModelProperty(value = "璁惧ID")
private String equipmentId;
+ /**
+ * 宸ュ崟鍙�
+ */
+ @Excel(name = "宸ュ崟鍙�", width = 15)
+ @ApiModelProperty(value = "宸ュ崟鍙�")
+ private String orderNum;
+ /**
+ * 璁″垝淇濆吇鏃ユ湡
+ */
+ @ApiModelProperty(value = "璁″垝淇濆吇鏃ユ湡;鎻愬墠70澶╃敓鎴愬伐鍗�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date maintenanceDate;
/**
* 鍘嬬缉绌烘皵鍘嬪姏(MPa)
*/
@@ -83,13 +103,13 @@
*/
@Excel(name = "淇濆吇浜�", width = 15)
@ApiModelProperty(value = "淇濆吇浜�")
- @Dict(dicCode = "sys_user, realname, username")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String operator;
/**
- * 淇濆吇鏃ユ湡
+ * 淇濆吇鏃堕棿
*/
- @ApiModelProperty(value = "淇濆吇鏃ユ湡")
- @Excel(name = "淇濆吇鏃ユ湡", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "淇濆吇鏃堕棿")
+ @Excel(name = "淇濆吇鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date operateTime;
@@ -98,6 +118,7 @@
*/
@Excel(name = "淇濆吇鐘舵��;寰呮彁浜ゃ�佸緟纭銆佸凡瀹屾垚", width = 15)
@ApiModelProperty(value = "淇濆吇鐘舵��;寰呮彁浜ゃ�佸緟纭銆佸凡瀹屾垚")
+ @Dict(dicCode = "third_maintenance_furnace_status")
private String maintenanceStatus;
/**
* 鑳藉惁婊¤冻鍔犲伐闇�姹�;鏄惁
@@ -110,8 +131,11 @@
*/
@Excel(name = "纭浜�", width = 15)
@ApiModelProperty(value = "纭浜�")
- @Dict(dicCode = "sys_user, realname, username")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String confirmUser;
+ /** 纭绫诲瀷 1 閫氳繃 2 椹冲洖 */
+ @ApiModelProperty(value = "纭绫诲瀷")
+ private String confirmDealType;
/**
* 纭鏃ユ湡
*/
@@ -126,4 +150,11 @@
@Excel(name = "HF缂栫爜", width = 15)
@ApiModelProperty(value = "HF缂栫爜")
private String hfCode;
+ //鍒楄〃灞曠ず
+ @TableField(exist = false)
+ private String equipmentCode;
+ @TableField(exist = false)
+ private String equipmentName;
+ @TableField(exist = false)
+ private String equipmentModel;
}
--
Gitblit v1.9.3