From 54f9ec068f7e22adceaa0b5991961b141a424c83 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期二, 12 八月 2025 12:39:54 +0800
Subject: [PATCH] 飞书配置： appId/appSecret/部门：departmentId
---
src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml b/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
index 3087928..f4dcaf8 100644
--- a/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
+++ b/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
@@ -95,10 +95,10 @@
me.*
FROM
mdc_equipment me
- LEFT JOIN mdc_production_equipment mpe ON me.id = mpe.equipment_id
+ LEFT JOIN base_equipment_factory mpe ON me.id = mpe.equipment_id
WHERE
- mpe.production_id IN
- <foreach collection="allProductionIds" index="index" item="id" open="(" separator="," close=")">
+ mpe.factory_id IN
+ <foreach collection="allFactoryIds" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</select>
@@ -181,14 +181,14 @@
SELECT
mp.id,
mp.parent_id,
- mp.production_name,
- mp.org_type,
+ mp.factory_name AS productionName,
+ mp.factory_category AS orgtype,
me.equipment_id,
me.equipment_name,
me.equipment_type
FROM
- mdc_production_equipment mpe
- LEFT JOIN mdc_production mp ON mpe.production_id = mp.id
+ base_equipment_factory mpe
+ LEFT JOIN base_factory mp ON mpe.factory_id = mp.id
LEFT JOIN mdc_equipment me ON me.id = mpe.equipment_id
<where>
me.equipment_id IN
@@ -196,7 +196,7 @@
#{id}
</foreach>
</where>
- ORDER BY mp.production_order
+ ORDER BY mp.sorter
</select>
<!--鏍规嵁澶у睆杞﹂棿id鏌ヨ璁惧鍒楄〃-->
@@ -221,8 +221,8 @@
t1.*
FROM
mdc_equipment t1
- LEFT JOIN mdc_production_equipment t2 ON t1.id = t2.equipment_id
- LEFT JOIN mdc_production t3 ON t2.production_id = t3.id
+ LEFT JOIN base_equipment_factory t2 ON t1.id = t2.equipment_id
+ LEFT JOIN base_factory t3 ON t2.factory_id = t3.id
<where>
<if test="mdcEquipment.equipmentId != null and mdcEquipment.equipmentId != '' ">
AND t1.equipment_id LIKE CONCAT(CONCAT('%',#{mdcEquipment.equipmentId}),'%')
@@ -260,8 +260,8 @@
t1.*
FROM
mdc_equipment t1
- LEFT JOIN mdc_production_equipment t2 ON t1.id = t2.equipment_id
- LEFT JOIN mdc_production t3 ON t2.production_id = t3.id
+ LEFT JOIN base_equipment_factory t2 ON t1.id = t2.equipment_id
+ LEFT JOIN base_factory t3 ON t2.production_id = t3.id
<where>
<if test="mdcEquipment.equipmentId != null and mdcEquipment.equipmentId != '' ">
AND t1.equipment_id LIKE CONCAT(CONCAT('%',#{mdcEquipment.equipmentId}),'%')
--
Gitblit v1.9.3