From a16b8f1035fa93ac1333fb273da2c48b68bf7126 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 14 五月 2025 17:45:38 +0800
Subject: [PATCH] art: 设备管理-二保-新增，编辑功能
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java | 47 +++++++++++++++++++++++++++++++++++------------
1 files changed, 35 insertions(+), 12 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..57cc814 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,14 +1,18 @@
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;
@@ -55,44 +59,63 @@
/**鏍囧噯ID*/
@Excel(name = "鏍囧噯ID", width = 15)
@ApiModelProperty(value = "鏍囧噯ID")
+ @Dict(dicCode = "eam_maintenance_standard, standard_name, id")
private String standardId;
- /**璁″垝寮�濮嬫椂闂�*/
- @ApiModelProperty(value = "璁″垝寮�濮嬫椂闂�")
- private Date planStartTime;
- /**璁″垝缁撴潫鏃堕棿*/
- @ApiModelProperty(value = "璁″垝缁撴潫鏃堕棿")
- private Date planEndTime;
+ /**璁″垝淇濆吇鏃ユ湡*/
+ @ApiModelProperty(value = "璁″垝淇濆吇鏃ユ湡")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date maintenanceDate;
/**瀹為檯寮�濮嬫椂闂�*/
@ApiModelProperty(value = "瀹為檯寮�濮嬫椂闂�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date actualStartTime;
/**瀹為檯缁撴潫鏃堕棿*/
@ApiModelProperty(value = "瀹為檯缁撴潫鏃堕棿")
+ @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 = "淇濆吇浜�")
+ @Dict(dicCode = "sys_user, realname, username")
private String operator;
/**淇濆吇鐘舵��*/
@Excel(name = "淇濆吇鐘舵��", width = 15)
@ApiModelProperty(value = "淇濆吇鐘舵��")
+ @Dict(dicCode = "second_maintenance_status")
private String maintenanceStatus;
/**鍒涘缓鏂瑰紡*/
@Excel(name = "鍒涘缓鏂瑰紡", width = 15)
@ApiModelProperty(value = "鍒涘缓鏂瑰紡")
+ @Dict(dicCode = "order_creation_method")
private String creationMethod;
- /**璁惧绠＄悊鍛樼‘璁�*/
- @Excel(name = "璁惧绠＄悊鍛樼‘璁�", width = 15)
- @ApiModelProperty(value = "璁惧绠＄悊鍛樼‘璁�")
+ /**缁翠慨缁勯暱纭*/
+ @Excel(name = "缁翠慨缁勯暱纭", width = 15)
+ @ApiModelProperty(value = "缁翠慨缁勯暱纭")
+ @Dict(dicCode = "sys_user, realname, username")
private String confirmUser;
+ /**纭鎰忚*/
+ @ApiModelProperty(value = "纭鎰忚")
+ private String confirmComment;
/**纭鏃堕棿*/
@ApiModelProperty(value = "纭鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date confirmTime;
- /**鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧*/
- @Excel(name = "鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧", width = 15)
- @ApiModelProperty(value = "鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧")
+ /**淇濆吇涓婁紶鍥剧墖*/
+ @Excel(name = "淇濆吇涓婁紶鍥剧墖", width = 15)
+ @ApiModelProperty(value = "淇濆吇涓婁紶鍥剧墖")
private String imageFiles;
/**澶囨敞*/
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
private String remark;
+
+ //鍒楄〃灞曠ず
+ @TableField(exist = false)
+ private String equipmentCode;
+ @TableField(exist = false)
+ private String equipmentName;
}
--
Gitblit v1.9.3