From 05af237671e1a4c356fd8bf6cb837f3fe8a3863d Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 13 九月 2023 17:31:06 +0800
Subject: [PATCH] 预测性维护工单
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PredictiveWorkOrderMapper.xml | 2 ++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PredictiveWorkOrder.java | 7 +++++++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PredictiveWorkOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PredictiveWorkOrder.java
index 64c8f83..6ccab40 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PredictiveWorkOrder.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PredictiveWorkOrder.java
@@ -56,6 +56,7 @@
*/
@Excel(name = "淇濆吇浜�", width = 15)
@ApiModelProperty(value = "淇濆吇浜�")
+ @Dict(dicCode = "id",dictTable = "sys_user",dicText = "realname")
private String maintenanceUserId;
/**
* 璁″垝寮�濮嬫椂闂�
@@ -92,6 +93,7 @@
*/
@Excel(name = "鐘舵��", width = 15)
@ApiModelProperty(value = "鐘舵��")
+ @Dict(dicCode = "maintenance_order_status")
private String status = CommonConstant.STATUS_1;
/**
* 澶囩敤瀛楁1
@@ -159,5 +161,10 @@
@TableField(exist = false)
@Dict(dicText = "depart_name",dicCode = "id",dictTable = "sys_depart")
private String useId;
+ @TableField(exist = false)
+ @Dict(dicCode = "assign_mode")
+ private String assignMode;
+ @TableField(exist = false)
+ private String actualWorkingHourQuota;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PredictiveWorkOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PredictiveWorkOrderMapper.xml
index 2754f9e..30bc644 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PredictiveWorkOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PredictiveWorkOrderMapper.xml
@@ -49,6 +49,7 @@
select
t1.id id,
t1.num num,
+ t1.status status,
t1.item_id itemId,
t1.actual_start_time actualStartTime,
t1.actual_end_time actualEndTime,
@@ -59,6 +60,7 @@
t1.maintenance_user_id maintenanceUserId,
t2.monitor_type monitorType,
t2.num planNum,
+ t2.id workPlanId,
t2.team_id teamId,
t2.plan_version version,
t2.assign_mode assignMode,
--
Gitblit v1.9.3