From 9a9697c55fa66821cf74165ac2ae820182dae94d Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 23 七月 2025 17:41:53 +0800
Subject: [PATCH] 设备维修对应接口
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java | 190 +++++++++++++++++------------------------------
1 files changed, 68 insertions(+), 122 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java
index c28502d..15b02d4 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java
@@ -1,7 +1,10 @@
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;
@@ -10,6 +13,7 @@
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
@@ -27,7 +31,26 @@
public class EamRepairOrder extends JeecgEntity implements Serializable {
private static final long serialVersionUID = -2336763554235629574L;
-
+ /**涓婚敭*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "涓婚敭")
+ 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")
+ @ApiModelProperty(value = "鍒涘缓鏃ユ湡")
+ private Date createTime;
+ /**鏇存柊浜�*/
+ @ApiModelProperty(value = "鏇存柊浜�")
+ private String updateBy;
+ /**鏇存柊鏃ユ湡*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鏇存柊鏃ユ湡")
+ private Date updateTime;
/**
* 鍒犻櫎鏍囪
*/
@@ -40,144 +63,61 @@
@Excel(name = "宸ュ崟缂栧彿", width = 15)
@ApiModelProperty(value = "宸ュ崟缂栧彿")
private String repairCode;
- /**
- * 鎶ヤ慨ID
- */
+ /** 鎶ヤ慨ID*/
@Excel(name = "鎶ヤ慨ID", width = 15)
@ApiModelProperty(value = "鎶ヤ慨ID")
private String reportId;
- /**
- * 璁惧ID
- */
+ /**璁惧ID*/
@Excel(name = "璁惧ID", width = 15)
@ApiModelProperty(value = "璁惧ID")
-// @Dict(dictTable = "eam_equipment", dicCode = "id", dicText = "equipment_code")
+ @Dict(dictTable = "eam_equipment", dicCode = "id", dicText = "equipment_name")
private String equipmentId;
- /**
- * 缁翠慨鐘舵��
- */
- @Excel(name = "缁翠慨鐘舵��", width = 15)
- @ApiModelProperty(value = "缁翠慨鐘舵��")
- @Dict(dicCode = "report_repair_status")
+ /** 缁翠慨鐘舵��*/
+ @ApiModelProperty(name = "缁翠慨鐘舵��",notes = "寰呯淮淇�佺淮淇腑銆佸緟纭銆佺淮淇畬鎴�")
+ @Dict(dicCode = "repair_status")
private String repairStatus;
- /**
- * 缁翠慨寮�濮嬫椂闂�
- */
- @ApiModelProperty(value = "缁翠慨寮�濮嬫椂闂�")
+ /** 缁翠慨寮�濮嬫椂闂� */
+ @ApiModelProperty(name = "缁翠慨寮�濮嬫椂闂�",notes = "")
private Date actualStartTime;
- /**
- * 缁翠慨缁撴潫鏃堕棿
- */
- @ApiModelProperty(value = "缁翠慨缁撴潫鏃堕棿")
+ /** 缁翠慨缁撴潫鏃堕棿 */
+ @ApiModelProperty(name = "缁翠慨缁撴潫鏃堕棿",notes = "")
private Date actualEndTime;
-
- /**
- * 缁翠慨纭缁撴灉
- */
- @ApiModelProperty(value = "缁翠慨纭缁撴灉")
- @Dict(dicCode = "yn")
+ /** 缁翠慨纭 */
+ @ApiModelProperty(name = "缁翠慨纭",notes = "")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String repairConfirm;
- /**
- * 缁翠慨纭鎰忚
- */
- @ApiModelProperty(value = "缁翠慨纭鎰忚")
+ /** 缁翠慨纭鎰忚 */
+ @ApiModelProperty(name = "缁翠慨纭鎰忚",notes = "")
private String repairConfirmComment;
- /**
- * 缁翠慨纭鏃堕棿
- */
- @ApiModelProperty(value = "缁翠慨纭鏃堕棿")
+ /** 缁翠慨纭鏃堕棿 */
+ @ApiModelProperty(name = "缁翠慨纭鏃堕棿",notes = "")
private Date repairConfirmTime;
- /**
- * 鏁呴殰鍘熷洜
- */
- @Excel(name = "鏁呴殰鍘熷洜", width = 15)
- @ApiModelProperty(value = "鏁呴殰鍘熷洜")
+ /** 鏁呴殰鍘熷洜 */
+ @ApiModelProperty(name = "鏁呴殰鍘熷洜",notes = "")
private String faultReason;
- /**
- * 缁翠慨缁撴灉鎻忚堪
- */
- @Excel(name = "缁翠慨缁撴灉鎻忚堪", width = 15)
- @ApiModelProperty(value = "缁翠慨缁撴灉鎻忚堪")
- private String repairDescription;
- /**
- * 缁翠慨璐熻矗浜�
- */
- @Excel(name = "缁翠慨璐熻矗浜�", width = 15)
- @ApiModelProperty(value = "缁翠慨璐熻矗浜�")
- @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
- private String repairer;
-
- /**
- * 纭棰嗗
- */
- @ApiModelProperty(value = "纭棰嗗")
- @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
- private String leaderUser;
- /**
- * 棰嗗纭缁撴灉
- */
- @ApiModelProperty(value = "棰嗗纭缁撴灉")
- @Dict(dicCode = "yn")
- private String leaderConfirm;
- /**
- * 纭鎰忚
- */
- @ApiModelProperty(value = "纭鎰忚")
- private String leaderConfirmComment;
- /**
- * 纭鏃堕棿
- */
- @ApiModelProperty(value = "纭鏃堕棿")
- private Date leaderConfirmTime;
- /**
- * 鏈哄姩鍔炵淮淇汉
- */
- @ApiModelProperty(value = "鏈哄姩鍔炵淮淇汉")
- @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
- private String externalRepairer;
- /**
- * 鏈哄姩鍔炵‘璁ょ粨鏋�
- */
- @ApiModelProperty(value = "鏈哄姩鍔炵‘璁ょ粨鏋�")
- @Dict(dicCode = "yn")
- private String externalConfirm;
- /**
- * 鏈哄姩鍔炵‘璁ゆ剰瑙�
- */
- @ApiModelProperty(value = "鏈哄姩鍔炵‘璁ゆ剰瑙�")
- private String externalConfirmComment;
- /**
- * 鏈哄姩鍔炵‘璁ゆ椂闂�
- */
- @ApiModelProperty(value = "鏈哄姩鍔炵‘璁ゆ椂闂�")
- private Date externalConfirmTime;
- /**
- * 濮斿璐熻矗浜�
- */
- @Excel(name = "濮斿璐熻矗浜�", width = 15)
- @ApiModelProperty(value = "濮斿璐熻矗浜�")
- private String outsourcedUser;
- /**
- * 鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧
- */
- @Excel(name = "鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧", width = 15)
- @ApiModelProperty(value = "鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧")
- private String imageFiles;
- /**
- * 鎿嶄綔宸ョ‘璁�
- */
- @ApiModelProperty(value = "鎿嶄綔宸ョ‘璁�")
+ /** 鏁呴殰鍒嗘瀽 */
+ @ApiModelProperty(name = "鏁呴殰鍒嗘瀽",notes = "")
+ private String faultAnalysis;
+ /** 鎺掓晠杩囩▼ */
+ @ApiModelProperty(name = "鎺掓晠杩囩▼",notes = "")
+ private String faultProcess;
+ /** 棰勯槻鎺柦 */
+ @ApiModelProperty(name = "棰勯槻鎺柦",notes = "")
+ private String faultPrevent;
+ /** 鎿嶄綔宸� */
+ @ApiModelProperty(name = "鎿嶄綔宸�",notes = "")
@Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String confirmer;
- /**
- * 鎿嶄綔宸ョ‘璁ゆ剰瑙�
- */
- @ApiModelProperty(value = "鎿嶄綔宸ョ‘璁ゆ剰瑙�")
+ /** 鎿嶄綔宸ョ‘璁ょ粨鏋�*/
+ @ApiModelProperty(name = "鎿嶄綔宸ョ‘璁ょ粨鏋�",notes = "")
+ private String confirmResult;
+ /** 鎿嶄綔宸ョ‘璁ゆ剰瑙� */
+ @ApiModelProperty(name = "鎿嶄綔宸ョ‘璁ゆ剰瑙�",notes = "")
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;
@TableField(exist = false)
@@ -189,6 +129,12 @@
@TableField(exist = false)
@ApiModelProperty(value = "璁惧缂栫爜")
private String equipmentCode;
+ /**
+ * 璁惧鍨嬪彿
+ */
+ @TableField(exist = false)
+ @ApiModelProperty(value = "璁惧鍨嬪彿")
+ private String equipmentModel;
@TableField(exist = false)
private String installationPosition;
}
--
Gitblit v1.9.3