From a6d22f16447c4b440b269fa8b43daf919e5a10c4 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 12 十月 2023 10:11:25 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcWorkshopEquipment.java | 6 ++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml | 2 +-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcWorkshopEquipment.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcWorkshopEquipment.java
index 9583205..89474e3 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcWorkshopEquipment.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcWorkshopEquipment.java
@@ -38,6 +38,12 @@
private String equipmentId;
/**
+ * 璁惧鍥剧墖
+ */
+ @ApiModelProperty(value = "璁惧鍥剧墖")
+ private String equipmentImage;
+
+ /**
* 鍧愭爣-宸�
*/
@ApiModelProperty(value = "鍧愭爣-宸�")
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
index cef5f36..5964eff 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
@@ -204,7 +204,7 @@
<where>
AND mwe.workshop_id = #{ workshopEquipmentVo.workshopId }
<if test="workshopEquipmentVo.equipmentId != null and workshopEquipmentVo.equipmentId != ''">
- AND mwe.equipment_id = #{equipmentId}
+ AND mwe.equipment_id = #{ workshopEquipmentVo.equipmentId }
</if>
</where>
ORDER BY me.equipment_id
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml
index 5d1b1ab..9a5eed6 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml
@@ -7,7 +7,7 @@
SELECT
mew.id id,
a.EquipmentID equipmentId,
- a.EquipmentName equipmentName,
+ mew.equipment_image equipmentImage,
a.Oporation equipmentStatus,
mew.coordinate_left coordinateLeft,
mew.coordinate_top coordinateTop,
--
Gitblit v1.9.3