From 58f63d0e061123b15f780d294272d8a461f183db Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 23 七月 2025 17:41:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamRepairOrderDto.java | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 106 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamRepairOrderDto.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamRepairOrderDto.java
new file mode 100644
index 0000000..07c7beb
--- /dev/null
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamRepairOrderDto.java
@@ -0,0 +1,106 @@
+package org.jeecg.modules.eam.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+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.jeecg.common.aspect.annotation.DictList;
+import org.jeecg.modules.eam.entity.EamRepairPerson;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "eam_repair_order瀵硅薄", description = "缁翠慨宸ュ崟")
+public class EamRepairOrderDto {
+
+ /**涓婚敭*/
+ private String id;
+ /**鍒涘缓浜�*/
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private String createBy;
+ /**鍒涘缓鏃ユ湡*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+ /**鏇存柊浜�*/
+ private String updateBy;
+ /**鏇存柊鏃ユ湡*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+ /**鍒犻櫎鏍囪*/
+ private Integer delFlag;
+ /**宸ュ崟缂栧彿*/
+ private String repairCode;
+ /**鎶ヤ慨ID*/
+ private String reportId;
+ /**璁惧ID*/
+ @Dict(dictTable = "eam_equipment", dicCode = "id", dicText = "equipment_name")
+ private String equipmentId;
+ /** 缁翠慨鐘舵��*/
+ @Dict(dicCode = "repair_status")
+ private String repairStatus ;
+ /** 缁翠慨寮�濮嬫椂闂� */
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date actualStartTime ;
+ /** 缁翠慨缁撴潫鏃堕棿 */
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date actualEndTime ;
+ /** 缁翠慨纭 */
+ private String repairConfirm ;
+ /** 缁翠慨纭鎰忚 */
+ private String repairConfirmComment ;
+ /** 缁翠慨纭鏃堕棿 */
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date repairConfirmTime ;
+ /** 鏁呴殰鍘熷洜 */
+ private String faultReason ;
+ /** 鏁呴殰鍒嗘瀽 */
+ private String faultAnalysis ;
+ /** 鎺掓晠杩囩▼ */
+ private String faultProcess ;
+ /** 棰勯槻鎺柦 */
+ private String faultPrevent ;
+ /** 鎿嶄綔宸� */
+ @ApiModelProperty(name = "鎿嶄綔宸�",notes = "")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
+ private String confirmer;
+ /** 鎿嶄綔宸ョ‘璁ょ粨鏋�*/
+ @ApiModelProperty(name = "鎿嶄綔宸ョ‘璁ょ粨鏋�",notes = "")
+ private String confirmResult;
+ /** 鎿嶄綔宸ョ‘璁ゆ椂闂� */
+ @ApiModelProperty(name = "鎿嶄綔宸ョ‘璁ゆ椂闂�",notes = "")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date confirmTime;
+ /** 鎿嶄綔宸ョ‘璁ゆ剰瑙� */
+ @ApiModelProperty(name = "鎿嶄綔宸ョ‘璁ゆ剰瑙�",notes = "")
+ private String confirmComment;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "璁惧鍚嶇О")
+ private String equipmentName;
+ /**璁惧缂栫爜*/
+ private String equipmentCode;
+ /**璁惧鍨嬪彿*/
+ private String equipmentModel;
+ @TableField(exist = false)
+ private String installationPosition;
+
+ /**鏁呴殰缁翠慨浜哄憳鍒楄〃*/
+ @DictList
+ private List<EamRepairPerson> eamRepairPersonList;
+}
--
Gitblit v1.9.3