From 1cbbb341d22e3c46b15af65b6f97d738bae7ca95 Mon Sep 17 00:00:00 2001
From: yangbin <yangbin>
Date: 星期二, 20 五月 2025 10:46:57 +0800
Subject: [PATCH] 自动化
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java | 178 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 121 insertions(+), 57 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java
index b32f115..81095c5 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java
@@ -1,98 +1,162 @@
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;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
+
/**
* @Description: 璁惧浜岀骇淇濆吇
* @Author: jeecg-boot
- * @Date: 2025-04-29
+ * @Date: 2025-04-29
* @Version: V1.0
*/
@Data
@TableName("eam_second_maintenance_order")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
-@ApiModel(value="eam_second_maintenance_order瀵硅薄", description="璁惧浜岀骇淇濆吇")
+@ApiModel(value = "eam_second_maintenance_order瀵硅薄", description = "璁惧浜岀骇淇濆吇")
public class EamSecondMaintenanceOrder 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;
- /**宸ュ崟鍙�*/
- @Excel(name = "宸ュ崟鍙�", width = 15)
+ private Integer delFlag;
+ /**
+ * 宸ュ崟鍙�
+ */
+ @Excel(name = "宸ュ崟鍙�", width = 15)
@ApiModelProperty(value = "宸ュ崟鍙�")
- private String orderNum;
- /**璁惧ID*/
- @Excel(name = "璁惧ID", width = 15)
+ private String orderNum;
+ /**
+ * 璁惧ID
+ */
+ @Excel(name = "璁惧ID", width = 15)
@ApiModelProperty(value = "璁惧ID")
- private String equipmentId;
- /**鏍囧噯ID*/
- @Excel(name = "鏍囧噯ID", width = 15)
+ private String equipmentId;
+ /**
+ * 鏍囧噯ID
+ */
+ @Excel(name = "鏍囧噯ID", width = 15)
@ApiModelProperty(value = "鏍囧噯ID")
- private String standardId;
- /**璁″垝寮�濮嬫椂闂�*/
- @ApiModelProperty(value = "璁″垝寮�濮嬫椂闂�")
- private Date planStartTime;
- /**璁″垝缁撴潫鏃堕棿*/
- @ApiModelProperty(value = "璁″垝缁撴潫鏃堕棿")
- private Date planEndTime;
- /**瀹為檯寮�濮嬫椂闂�*/
+ @Dict(dicCode = "eam_maintenance_standard, standard_name, id")
+ private String standardId;
+ /**
+ * 璁″垝淇濆吇鏃ユ湡
+ */
+ @ApiModelProperty(value = "璁″垝淇濆吇鏃ユ湡")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date maintenanceDate;
+ /**
+ * 瀹為檯寮�濮嬫椂闂�
+ */
@ApiModelProperty(value = "瀹為檯寮�濮嬫椂闂�")
- private Date actualStartTime;
- /**瀹為檯缁撴潫鏃堕棿*/
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date actualStartTime;
+ /**
+ * 瀹為檯缁撴潫鏃堕棿
+ */
@ApiModelProperty(value = "瀹為檯缁撴潫鏃堕棿")
- private Date actualEndTime;
- /**淇濆吇浜�*/
- @Excel(name = "淇濆吇浜�", width = 15)
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date actualEndTime;
+ /**
+ * 淇濆吇浜�
+ */
+ @Excel(name = "淇濆吇浜�", width = 15)
@ApiModelProperty(value = "淇濆吇浜�")
- private String operator;
- /**淇濆吇鐘舵��*/
- @Excel(name = "淇濆吇鐘舵��", width = 15)
+ @Dict(dicCode = "sys_user, realname, username")
+ private String operator;
+ /**
+ * 淇濆吇鐘舵��
+ */
+ @Excel(name = "淇濆吇鐘舵��", width = 15)
@ApiModelProperty(value = "淇濆吇鐘舵��")
- private String maintenanceStatus;
- /**鍒涘缓鏂瑰紡*/
- @Excel(name = "鍒涘缓鏂瑰紡", width = 15)
+ @Dict(dicCode = "second_maintenance_status")
+ private String maintenanceStatus;
+ /**
+ * 鍒涘缓鏂瑰紡
+ */
+ @Excel(name = "鍒涘缓鏂瑰紡", width = 15)
@ApiModelProperty(value = "鍒涘缓鏂瑰紡")
- private String creationMethod;
- /**璁惧绠＄悊鍛樼‘璁�*/
- @Excel(name = "璁惧绠＄悊鍛樼‘璁�", width = 15)
- @ApiModelProperty(value = "璁惧绠＄悊鍛樼‘璁�")
- private String confirmUser;
- /**纭鏃堕棿*/
+ @Dict(dicCode = "order_creation_method")
+ private String creationMethod;
+ /**
+ * 缁翠慨缁勯暱纭
+ */
+ @Excel(name = "缁翠慨缁勯暱纭", width = 15)
+ @ApiModelProperty(value = "缁翠慨缁勯暱纭")
+ @Dict(dicCode = "sys_user, realname, username")
+ private String confirmUser;
+ /**
+ * 纭鎰忚
+ */
+ @ApiModelProperty(value = "纭鎰忚")
+ private String confirmComment;
+ /**
+ * 纭鏃堕棿
+ */
@ApiModelProperty(value = "纭鏃堕棿")
- private Date confirmTime;
- /**鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧*/
- @Excel(name = "鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧", width = 15)
- @ApiModelProperty(value = "鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧")
- private String imageFiles;
- /**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date confirmTime;
+ /**
+ * 淇濆吇涓婁紶鍥剧墖
+ */
+ @Excel(name = "淇濆吇涓婁紶鍥剧墖", width = 15)
+ @ApiModelProperty(value = "淇濆吇涓婁紶鍥剧墖")
+ private String imageFiles;
+ /**
+ * 澶囨敞
+ */
+ @Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
- private String remark;
+ private String remark;
+
+ //鍒楄〃灞曠ず
+ @TableField(exist = false)
+ private String equipmentCode;
+ @TableField(exist = false)
+ private String equipmentName;
}
--
Gitblit v1.9.3