From 15ae1e3b5cda40a8248a1addf4a64c1e0a9e2b13 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 12 七月 2024 18:02:04 +0800
Subject: [PATCH] 设备管理修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartRequirement.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartRequirement.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartRequirement.java
index 6cba4d9..d9883e8 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartRequirement.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/entity/SparePartRequirement.java
@@ -1,15 +1,22 @@
package org.jeecg.modules.spare.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.entity.JeecgEntity;
+import org.jeecg.modules.eam.entity.DailyInspectionStandard;
+import org.jeecg.modules.eam.entity.DailyInspectionStandardDetail;
import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+import java.util.List;
/**
* @Description: 澶囦欢闇�姹�
@@ -55,7 +62,34 @@
/**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
@Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
@ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
+ @TableLogic
private Integer delFlag = CommonConstant.DEL_FLAG_0;
+ @ApiModelProperty(value = "璇疯喘浜�")
+ private String person;
+
+ @ApiModelProperty(value = "璁惧鍙拌处")
+ private String equipmentId;
+
+ @ApiModelProperty(value = "瀹℃壒浜�")
+ private String auditPerson;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @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 java.util.Date auditTime;
+
+ @TableField(exist = false)
+ private String equipmentNumNameModel;
+
+ @TableField(exist = false)
+ private List<SparePartRequirementDeatil> sparePartRequirementDeatilList;
+
+// @TableField(exist = false)
+// private List<DailyInspectionStandard> dailyInspectionStandardlist;
}
--
Gitblit v1.9.3