From 1007e0b552accd3288e7da6b47d8cc49a03bdf62 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期日, 27 四月 2025 11:06:35 +0800
Subject: [PATCH] art: 从沃克项目迁移设备管理代码到航宇
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java | 30 ++++++++++++------------------
1 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
similarity index 87%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
rename to lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
index bb2358a..863aa72 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
@@ -1,9 +1,6 @@
package org.jeecg.modules.eam.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -16,7 +13,6 @@
import java.io.Serializable;
import java.util.Date;
-import java.util.List;
/**
* @Description: 鐐规宸ュ崟
@@ -65,12 +61,11 @@
/**璁惧ID*/
@Excel(name = "璁惧ID", width = 15)
@ApiModelProperty(value = "璁惧ID")
- @Dict(dictTable = "eam_equipment", dicCode = "id", dicText = "equipment_code")
private String equipmentId;
/**鏍囧噯ID*/
@Excel(name = "淇濆吇鏍囧噯ID", width = 15)
@ApiModelProperty(value = "淇濆吇鏍囧噯ID")
- @Dict(dictTable = "eam_maintenance_standard", dicCode = "id", dicText = "standard_code")
+ @Dict(dictTable = "eam_maintenance_standard", dicCode = "id", dicText = "standard_name")
private String standardId;
/**鐐规鏃ユ湡*/
@Excel(name = "鐐规鏃ユ湡锛堣鍒掞級", width = 15, format = "yyyy-MM-dd")
@@ -116,6 +111,13 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "纭鏃堕棿")
private Date confirmTime;
+ /**纭鎰忚*/
+ @ApiModelProperty(value = "纭鎰忚")
+ private String confirmComment;
+ /** 纭绫诲瀷 1 閫氳繃 2 椹冲洖 */
+ @ApiModelProperty(value = "纭绫诲瀷")
+ @Dict(dicCode = "approved_rejected")
+ private String confirmDealType;
/**澶囨敞*/
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞-鐐规宸ュ崟鍒涘缓澶囨敞")
@@ -135,15 +137,7 @@
@ApiModelProperty(value = "璁惧缂栧彿")
private transient String equipmentCode;
- /**鍒楄〃 淇濆吇椤规槑缁�*/
- @ApiModelProperty(value = "鍒楄〃 淇濆吇椤规槑缁�")
- private transient List<EamInspectionOrderDetail> tableDetailList;
-
- /**澶勭悊绫诲瀷*/
- @ApiModelProperty(value = "澶勭悊绫诲瀷")
- private transient String dealType;
-
- /**澶勭悊鎰忚*/
- @ApiModelProperty(value = "澶勭悊鎰忚")
- private transient String dealSuggestion;
+ @ApiModelProperty(value = "璁惧鍚嶇О")
+ @TableField(exist = false)
+ private String equipmentName;
}
--
Gitblit v1.9.3