From a2bb2523a00f0085c94758c62280700e89b77fa7 Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期一, 16 十月 2023 09:36:56 +0800
Subject: [PATCH] 维修工单模块修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrder.java | 20 ++++++++++++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml | 4 ++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java | 5 +++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml | 1 +
4 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java
index 2d8963c..91ad5fd 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java
@@ -56,6 +56,11 @@
*/
private String approval;
/**
+ * 鏁呴殰鍘熷洜
+ */
+ @ApiModelProperty(value = "鏁呴殰鍘熷洜")
+ private String faultReason;
+ /**
* 鏁呴殰鎻忚堪
*/
@ApiModelProperty(value = "鏁呴殰鎻忚堪")
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrder.java
index d70ea19..34b5611 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrder.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrder.java
@@ -66,6 +66,26 @@
@ApiModelProperty(value = "浣跨敤閮ㄩ棬ID")
@Dict(dicCode = "id",dictTable ="sys_depart",dicText = "depart_name")
private String departId;
+ /**
+ * 鏁呴殰鍘熷洜
+ */
+ @ApiModelProperty(value = "鏁呴殰鍘熷洜")
+ private String faultReason;
+ /**
+ * 鏁呴殰鐜拌薄
+ */
+ @ApiModelProperty(value = "鏁呴殰鐜拌薄")
+ private String faultPhenomenon;
+ /**
+ * 鏁呴殰鎺掗櫎
+ */
+ @ApiModelProperty(value = "鏁呴殰鎺掗櫎")
+ private String faultRemove;
+ /**
+ * 棰勯槻鎺柦
+ */
+ @ApiModelProperty(value = "棰勯槻鎺柦")
+ private String preventiveMeasure;
/**鏁呴殰鎻忚堪*/
@Excel(name = "鏁呴殰鎻忚堪", width = 15)
@ApiModelProperty(value = "鏁呴殰鎻忚堪")
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml
index e3edcac..ac70eca 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml
@@ -6,6 +6,7 @@
t1.id,
t1.num num,
t1.equipment_id equipmentId,
+ t1.fault_reason faultReason,
t1.fault_description faultDescription,
t1.photo photo,
t1.is_stop isStop,
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml
index 2f75400..dd580f2 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml
@@ -15,6 +15,10 @@
t2.name equipmentName,
t2.model equipmentModel,
t2.specific_equipment specificEquipment,
+ t1.fault_reason faultReason,
+ t1.fault_phenomenon faultPhenomenon,
+ t1.preventive_measure preventiveMeasure,
+ t1.fault_remove faultRemove,
t1.fault_description faultDescription,
t1.fault_time faultTime,
t1.photo photo,
--
Gitblit v1.9.3