From f1e4e1427bf35e7d1cb3e0b580cf9995a472f214 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 18 八月 2025 17:40:12 +0800
Subject: [PATCH] 添加设备类别
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceOrderMapper.xml | 4 +++-
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamThirdMaintenanceOrderExport.java | 3 +++
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamThirdMaintenanceOrderExport.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamThirdMaintenanceOrderExport.java
index 30870f5..2c3202c 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamThirdMaintenanceOrderExport.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamThirdMaintenanceOrderExport.java
@@ -252,6 +252,9 @@
//鍨嬪彿
@TableField(exist = false)
private String equipmentModel;
+ @ApiModelProperty(value = "璁惧绫诲埆")
+ @Dict(dicCode = "equipment_category")
+ private String equipmentCategory;
//淇濆吇鏃ユ湡
private String maintenanceDateFormatted;
//浣跨敤鍗曚綅
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceOrderMapper.xml
index 92cc041..2054ac4 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceOrderMapper.xml
@@ -36,7 +36,9 @@
WHERE t1.id = #{id}
</select>
<select id="queryList" resultType="org.jeecg.modules.eam.dto.EamThirdMaintenanceOrderExport">
- select wmo.*,FORMAT(CAST(wmo.maintenance_date AS DATE), 'yyyy骞碝M鏈坉d鏃�') AS maintenance_date_formatted, e.equipment_code, e.equipment_name, e.equipment_model,f.factory_name
+ select wmo.*,FORMAT(CAST(wmo.maintenance_date AS DATE), 'yyyy骞碝M鏈坉d鏃�') AS maintenance_date_formatted,
+ e.equipment_code, e.equipment_name, e.equipment_model,e.equipment_category
+ ,f.factory_name
from eam_third_maintenance_order wmo
inner join eam_equipment e
on wmo.equipment_id = e.id
--
Gitblit v1.9.3