From 678ce38e5a842a451fc9a9222e0c03025357f975 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期一, 02 六月 2025 08:46:59 +0800 Subject: [PATCH] art: 设备管理-展示安装位置 --- lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java | 3 +++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamWeekMaintenanceOrderMapper.xml | 2 +- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml | 2 +- lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java | 3 +++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lxzn-module-eam-common/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 index 863aa72..2d79320 100644 --- a/lxzn-module-eam-common/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 @@ -140,4 +140,7 @@ @ApiModelProperty(value = "璁惧鍚嶇О") @TableField(exist = false) private String equipmentName; + @ApiModelProperty(value = "瀹夎浣嶇疆") + @TableField(exist = false) + private String installationPosition; } diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java index 3e51a93..6365bb4 100644 --- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java +++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java @@ -152,4 +152,7 @@ private String equipmentCode; @TableField(exist = false) private String equipmentName; + @ApiModelProperty(value = "瀹夎浣嶇疆") + @TableField(exist = false) + private String installationPosition; } diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml index 225c243..18a5e0b 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml @@ -3,7 +3,7 @@ <mapper namespace="org.jeecg.modules.eam.mapper.EamInspectionOrderMapper"> <select id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamInspectionOrder"> - select wmo.*, e.equipment_code, e.equipment_name + select wmo.*, e.equipment_code, e.equipment_name, e.installation_position from eam_inspection_order wmo inner join eam_equipment e on wmo.equipment_id = e.id diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamWeekMaintenanceOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamWeekMaintenanceOrderMapper.xml index 41f74de..a6ac183 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamWeekMaintenanceOrderMapper.xml +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamWeekMaintenanceOrderMapper.xml @@ -3,7 +3,7 @@ <mapper namespace="org.jeecg.modules.eam.mapper.EamWeekMaintenanceOrderMapper"> <select id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamWeekMaintenanceOrder"> - select wmo.*, e.equipment_code, e.equipment_name + select wmo.*, e.equipment_code, e.equipment_name, e.installation_position from eam_week_maintenance_order wmo inner join eam_equipment e on wmo.equipment_id = e.id -- Gitblit v1.9.3