From 21cbdad6f59a045910b22bb3bf771e47d56c096f Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 13 六月 2025 11:36:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java | 145 +++++++++++++++++++++++++++++++++--------------
1 files changed, 101 insertions(+), 44 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java
index 111fc78..5dabd18 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandard.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.eam.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -14,71 +15,127 @@
import java.io.Serializable;
import java.util.Date;
+
/**
* @Description: 淇濆吇鏍囧噯
* @Author: jeecg-boot
- * @Date: 2025-03-26
+ * @Date: 2025-03-26
* @Version: V1.0
*/
@Data
@TableName("eam_maintenance_standard")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
-@ApiModel(value="eam_maintenance_standard瀵硅薄", description="淇濆吇鏍囧噯")
+@ApiModel(value = "eam_maintenance_standard瀵硅薄", description = "淇濆吇鏍囧噯")
public class EamMaintenanceStandard implements Serializable {
-
- /**涓婚敭*/
- @TableId(type = IdType.ASSIGN_ID)
+
+ /**
+ * 涓婚敭
+ */
+ @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "涓婚敭")
- private String id;
- /**鍒涘缓浜�*/
+ private String id;
+ /**
+ * 鍒涘缓浜�
+ */
@ApiModelProperty(value = "鍒涘缓浜�")
- private String createBy;
- /**鍒涘缓鏃堕棿*/
+ private String createBy;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private Date createTime;
- /**鏇存柊浜�*/
+ private Date createTime;
+ /**
+ * 鏇存柊浜�
+ */
@ApiModelProperty(value = "鏇存柊浜�")
- private String updateBy;
- /**鏇存柊鏃堕棿*/
+ private String updateBy;
+ /**
+ * 鏇存柊鏃堕棿
+ */
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- private Date updateTime;
- /**鍒犻櫎鏍囪*/
+ private Date updateTime;
+ /**
+ * 鍒犻櫎鏍囪
+ */
@ApiModelProperty(value = "鍒犻櫎鏍囪")
- private Integer delFlag;
- /**鏍囧噯缂栫爜*/
+ private Integer delFlag;
+ /**
+ * 鏍囧噯缂栫爜
+ */
@ApiModelProperty(value = "鏍囧噯缂栫爜")
- private String standardCode;
- /**鏍囧噯鍚嶇О*/
+ private String standardCode;
+ /**
+ * 鏍囧噯鍚嶇О
+ */
@ApiModelProperty(value = "鏍囧噯鍚嶇О")
- private String standardName;
- /**淇濆吇鍛ㄦ湡;鍗曚綅:澶�*/
+ private String standardName;
+ /**
+ * 淇濆吇鍛ㄦ湡;鍗曚綅:澶�
+ */
@ApiModelProperty(value = "淇濆吇鍛ㄦ湡;鍗曚綅:澶�")
- private Integer maintenancePeriod;
- /**鍒濆鏃ユ湡 浠庡摢涓�澶╁紑濮嬭绠椾笅娆′繚鍏绘棩鏈�*/
- @ApiModelProperty(value = "鍒濆鏃ユ湡")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date initialDate;
- /**淇濆吇鍒嗙被*/
+ private Integer maintenancePeriod;
+ /**
+ * 鍒濆鏃ユ湡 浠庡摢涓�澶╁紑濮嬭绠椾笅娆′繚鍏绘棩鏈�
+ */
+ @ApiModelProperty(value = "鍒濆鏃ユ湡")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date initialDate;
+ /**
+ * 淇濆吇鍒嗙被
+ */
@ApiModelProperty(value = "淇濆吇鍒嗙被")
- @Dict(dicCode = "maintenance_category")
- private String maintenanceCategory;
- /**璁惧缂栧彿*/
+ @Dict(dicCode = "maintenance_category")
+ private String maintenanceCategory;
+ /**
+ * 璁惧缂栧彿
+ */
@ApiModelProperty(value = "璁惧缂栧彿")
- @Dict(dicCode = "eam_equipment, equipment_code, id")
- private String equipmentId;
- /**鏍囧噯鐘舵��*/
+ @Dict(dicCode = "eam_equipment, equipment_code, id")
+ private String equipmentId;
+ /**
+ * 鏍囧噯鐘舵��
+ */
@ApiModelProperty(value = "鏍囧噯鐘舵��")
- @Dict(dicCode = "maintenance_standard_status")
- private String standardStatus;
- /**鏍囧噯鐗堟湰*/
+ @Dict(dicCode = "maintenance_standard_status")
+ private String standardStatus;
+ /**
+ * 鏍囧噯鐗堟湰
+ */
@ApiModelProperty(value = "鏍囧噯鐗堟湰")
- private Integer standardVersion;
- /**鏂囦欢缂栧彿*/
- @ApiModelProperty(value = "鏂囦欢缂栧彿")
- private String fileCode;
- /**鍙傝�冩枃浠�*/
- @ApiModelProperty(value = "鍙傝�冩枃浠�")
- private String referenceFile;
+ private Integer standardVersion;
+ /**
+ * 鏂囦欢缂栧彿
+ */
+ @ApiModelProperty(value = "鏂囦欢缂栧彿")
+ private String fileCode;
+ /**
+ * 鍙傝�冩枃浠�
+ */
+ @ApiModelProperty(value = "鍙傝�冩枃浠�")
+ private String referenceFile;
+ /**
+ * 鏈�鏂扮敓鎴愬伐鍗曟椂闂�
+ * 涓嬩竴娆＄敓鎴愭椂闂翠负姝ゆ椂闂� + 淇濆吇鍛ㄦ湡
+ */
+ @ApiModelProperty(value = "鏈�鏂扮敓鎴愬伐鍗曟椂闂�")
+ private Date lastGenerateTime;
+
+ //鍒楄〃灞曠ず
+ @TableField(exist = false)
+ private String equipmentCode;
+ @TableField(exist = false)
+ private String equipmentName;
+ @TableField(exist = false)
+ private String keyword;
+ /**
+ * 璁惧缂栧彿鎷兼帴
+ */
+ @TableField(exist = false)
+ private String equipmentText;
+
+ public String getEquipmentText() {
+ return equipmentCode + "[" + equipmentName + "]";
+ }
}
--
Gitblit v1.9.3