From 56e8ccde7c982bc2a5b9746edb2e596c895f63e6 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 13 十二月 2023 15:20:07 +0800
Subject: [PATCH] 利用率页面添加平均值和合计值

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

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..945127c 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
@@ -168,7 +168,7 @@
                 #{id}
             </foreach>
         </where>
-        ORDER BY me.equipment_id
+        ORDER BY sd.depart_order
     </select>
 
     <!--鏍规嵁璁惧缂栧彿鏌ヨ璁惧淇℃伅鍜屼骇绾夸俊鎭�-->
@@ -191,7 +191,7 @@
                 #{id}
             </foreach>
         </where>
-        ORDER BY me.equipment_id
+        ORDER BY mp.production_order
     </select>
 
     <!--鏍规嵁澶у睆杞﹂棿id鏌ヨ璁惧鍒楄〃-->
@@ -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

--
Gitblit v1.9.3