From c2dbde3d4826946e7a40fff6efeb08547e4ab75a Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 25 三月 2025 14:22:37 +0800
Subject: [PATCH] art: 设备台账-分页查询修改
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java
index f77b494..3bacaed 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.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;
@@ -72,12 +73,14 @@
@ApiModelProperty(value = "鎿嶄綔绯荤粺")
private java.lang.String operationSystem;
/**浣跨敤閮ㄩ棬*/
- @Excel(name = "浣跨敤閮ㄩ棬", width = 15)
+ @Excel(name = "浣跨敤閮ㄩ棬", width = 15, dicCode = "mdc_production, production_name, id")
@ApiModelProperty(value = "浣跨敤閮ㄩ棬")
+ @Dict(dicCode = "mdc_production, production_name, id")
private java.lang.String orgId;
/**璁惧绠＄悊鍛�*/
- @Excel(name = "璁惧绠＄悊鍛�", width = 15)
+ @Excel(name = "璁惧绠＄悊鍛�", width = 15, dicCode = "sys_user, realname, username")
@ApiModelProperty(value = "璁惧绠＄悊鍛�")
+ @Dict(dicCode = "sys_user, realname, username")
private java.lang.String equipmentManager;
/**璁惧鍒嗙被*/
@Excel(name = "璁惧鍒嗙被", width = 15, dicCode = "equipment_category")
@@ -174,12 +177,16 @@
/**澶囨敞*/
@ApiModelProperty(value = "澶囨敞")
private java.lang.String remark;
- /**
- * 浣跨敤閮ㄩ棬鎵�鏈塈D
- * 浣跨敤閮ㄩ棬ID + 鍏舵墍鏈夌埗绾D, 浠ラ�楀彿鍒嗗壊
- */
- @ApiModelProperty(value = "浣跨敤閮ㄩ棬鎵�鏈塈D")
- private String orgParentIds;
@ApiModelProperty(value = "MDC璁惧绫诲瀷")
private String deviceType;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "缁翠慨鐘舵��")
+ @Dict(dicCode = "equipment_repair_status")
+ private String repairStatus;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "淇濆吇鐘舵��")
+ @Dict(dicCode = "equipment_maintenance_status")
+ private String maintenanceStatus;
}
--
Gitblit v1.9.3