From 4dda0622ef6e588284dbdb7a155f58b622615e94 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 15 五月 2025 13:33:58 +0800
Subject: [PATCH] art: 设备管理-三保，接口添加

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java |  207 ++++++++++++++++++++++++++++++---------------------
 1 files changed, 123 insertions(+), 84 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java
index 9281282..b1200b5 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.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;
@@ -9,120 +10,158 @@
 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_third_maintenance_order")
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value="eam_third_maintenance_order瀵硅薄", description="璁惧涓夌骇淇濆吇")
+@ApiModel(value = "eam_third_maintenance_order瀵硅薄", description = "璁惧涓夌骇淇濆吇")
 public class EamThirdMaintenanceOrder implements Serializable {
-    
-	/**涓婚敭*/
-	@TableId(type = IdType.ASSIGN_ID)
+
+    /**
+     * 涓婚敭
+     */
+    @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "涓婚敭")
-	private String id;
-	/**鍒涘缓浜�*/
-	@Excel(name = "鍒涘缓浜�", width = 15)
+    private String id;
+    /**
+     * 鍒涘缓浜�
+     */
+    @Excel(name = "鍒涘缓浜�", width = 15)
     @ApiModelProperty(value = "鍒涘缓浜�")
-	private String createBy;
-	/**鍒涘缓鏃堕棿*/
-	@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 String createBy;
+    /**
+     * 鍒涘缓鏃堕棿
+     */
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
-	private Date createTime;
-	/**鏇存柊浜�*/
-	@Excel(name = "鏇存柊浜�", width = 15)
+    private Date createTime;
+    /**
+     * 鏇存柊浜�
+     */
+    @Excel(name = "鏇存柊浜�", width = 15)
     @ApiModelProperty(value = "鏇存柊浜�")
-	private String updateBy;
-	/**鏇存柊鏃堕棿*/
-	@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 String updateBy;
+    /**
+     * 鏇存柊鏃堕棿
+     */
     @ApiModelProperty(value = "鏇存柊鏃堕棿")
-	private Date updateTime;
-	/**鍒犻櫎鏍囪*/
-	@Excel(name = "鍒犻櫎鏍囪", width = 15)
+    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;
-	/**璁″垝寮�濮嬫椂闂�*/
-	@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")
-    @ApiModelProperty(value = "璁″垝寮�濮嬫椂闂�")
-	private Date planStartTime;
-	/**璁″垝缁撴潫鏃堕棿*/
-	@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")
-    @ApiModelProperty(value = "璁″垝缁撴潫鏃堕棿")
-	private Date planEndTime;
-	/**瀹為檯寮�濮嬫椂闂�*/
-	@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")
+    @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;
+    /**
+     * 瀹為檯寮�濮嬫椂闂�
+     */
+    @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")
     @ApiModelProperty(value = "瀹為檯寮�濮嬫椂闂�")
-	private Date actualStartTime;
-	/**瀹為檯缁撴潫鏃堕棿*/
-	@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 actualStartTime;
+    /**
+     * 瀹為檯缁撴潫鏃堕棿
+     */
+    @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")
     @ApiModelProperty(value = "瀹為檯缁撴潫鏃堕棿")
-	private Date actualEndTime;
-	/**淇濆吇浜�*/
-	@Excel(name = "淇濆吇浜�", width = 15)
+    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 = "third_maintenance_status")
+    private String maintenanceStatus;
+    /**
+     * 鍒涘缓鏂瑰紡
+     */
+    @Excel(name = "鍒涘缓鏂瑰紡", width = 15)
     @ApiModelProperty(value = "鍒涘缓鏂瑰紡")
-	private String creationMethod;
-	/**璁惧绠＄悊鍛樼‘璁�*/
-	@Excel(name = "璁惧绠＄悊鍛樼‘璁�", width = 15)
+    @Dict(dicCode = "order_creation_method")
+    private String creationMethod;
+    /**
+     * 璁惧绠＄悊鍛樼‘璁�
+     */
+    @Excel(name = "璁惧绠＄悊鍛樼‘璁�", width = 15)
     @ApiModelProperty(value = "璁惧绠＄悊鍛樼‘璁�")
-	private String confirmUser;
-	/**纭鏃堕棿*/
-	@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")
+    @Dict(dicCode = "sys_user, realname, username")
+    private String confirmUser;
+    /**
+     * 纭鎰忚
+     */
+    @ApiModelProperty(value = "纭鎰忚")
+    private String confirmComment;
+    /**
+     * 纭鏃堕棿
+     */
+    @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")
     @ApiModelProperty(value = "纭鏃堕棿")
-	private Date confirmTime;
-	/**纭鐘舵��*/
-	@Excel(name = "纭鐘舵��", width = 15)
-    @ApiModelProperty(value = "纭鐘舵��")
-	private String confirmStatus;
-	/**鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧*/
-	@Excel(name = "鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧", width = 15)
-    @ApiModelProperty(value = "鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧")
-	private String imageFiles;
-	/**澶囨敞*/
-	@Excel(name = "澶囨敞", width = 15)
+    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