From c51323e6fcc84f08bc8c01e3dd6c916427f83f4e Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 07 三月 2024 10:41:50 +0800
Subject: [PATCH] 设备状态长时间未变化算法更新

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml |   12 ++++++------
 1 files changed, 6 insertions(+), 6 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 1d402c2..4e0ace6 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
@@ -248,11 +248,6 @@
         order by t1.sort_no
     </select>
 
-
-    <select id="getWorkLineLast" resultType="org.jeecg.modules.mdc.dto.MdcEquipmentDto">
-        select top 1 spindlespeed, actualspindlespeed from [${tableName}] order by CollectTime  desc
-    </select>
-
     <select id="exportXlsList" resultType="org.jeecg.modules.mdc.entity.MdcEquipment">
         SELECT
             t1.*
@@ -271,7 +266,7 @@
                 AND t1.equipment_name = #{mdcEquipment.equipmentModel}
             </if>
             <if test="mdcEquipment.equipmentType != null and mdcEquipment.equipmentType != '' ">
-                AND t1.equipmentType = #{mdcEquipment.equipmentType}
+                AND t1.equipment_type = #{mdcEquipment.equipmentType}
             </if>
             <if test="mdcEquipment.driveType != null and mdcEquipment.driveType != '' ">
                 AND t1.drive_type = #{mdcEquipment.driveType}
@@ -286,4 +281,9 @@
         order by t1.sort_no
     </select>
 
+    <!--鏌ヨ鍗曡〃鏁版嵁-->
+    <select id="findWorkLineLast" resultType="org.jeecg.modules.mdc.dto.MdcEquipmentDto">
+        select top 1 spindlespeed, actualspindlespeed from [${tableName}] order by CollectTime  desc
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3