From a3ca445facfebbe65d7133928eae1f9662451f6f Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 03 三月 2025 17:07:34 +0800
Subject: [PATCH] update

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

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 b41f8da..1473670 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
@@ -22,8 +22,9 @@
             INNER JOIN mdc_workshop_equipment mew ON mew.equipment_id = a.EquipmentID
             INNER JOIN mdc_equipment me ON me.equipment_id = a.EquipmentID
             INNER JOIN mdc_equipment_type met ON me.equipment_type = met.equipment_type_name
+            INNER JOIN mdc_workshop_info mwi ON mew.workshop_id = mwi.id
             AND a.CollectTime= b.maxgdtime
-            AND mew.workshop_id = #{ workshopId }
+            AND mwi.production_id = #{ productionId }
     </select>
 
     <select id="listByUser" resultType="org.jeecg.modules.mdc.entity.MdcWorkshopInfo">
@@ -38,4 +39,15 @@
         WHERE
             t5.user_id = #{ userId }
     </select>
+
+    <select id="productionListByUser" resultType="org.jeecg.modules.system.entity.MdcProduction">
+        SELECT
+            t1.*
+        FROM
+            mdc_production t1
+                 LEFT JOIN mdc_user_production t2 ON t1.id = t2.pro_id
+        WHERE
+            t1.org_type = 2 AND t2.user_id = #{userId}
+        ORDER BY t1.production_name
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3