From cf89583e4dd54632a0f11c06b859315c03958820 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 17 一月 2024 17:36:41 +0800
Subject: [PATCH] 设备运行状态及利用率预警任务

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml |   10 +++++-----
 1 files changed, 5 insertions(+), 5 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 6824c8a..298d26e 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
@@ -97,7 +97,6 @@
             MAX ( l.Oporation ) Oporation,
             k.id,
             k.equipment_status,
-            k.equipment_status_remark,
             k.equipment_type equipmentType,
             k.equipment_type_pictures
         FROM
@@ -108,11 +107,10 @@
                 MAX ( m.CollectTime ) CollectTime,
                 id,
                 equipment_status,
-                equipment_status_remark,
                 equipment_type,
                 equipment_type_pictures
             FROM
-                ( SELECT equipment_id EquipmentID, equipment_Name equipmentName, id, equipment_type, equipment_status, equipment_status_remark FROM mdc_equipment WHERE equipment_id IN
+                ( SELECT equipment_id EquipmentID, equipment_Name equipmentName, id, equipment_type, equipment_status FROM mdc_equipment WHERE equipment_id IN
                     <foreach collection="equipmentIds" index="index" item="id" open="(" separator="," close=")">
                         #{id}
                     </foreach>
@@ -124,7 +122,6 @@
                 id,
                 equipment_type,
                 equipment_status,
-                equipment_status_remark,
                 equipment_type_pictures
             ) k
             LEFT JOIN ( SELECT EquipmentID, CollectTime, Oporation FROM EquipmentLog WHERE Oporation <![CDATA[ <> ]]> 23 ) l ON k.CollectTime= l.CollectTime
@@ -135,7 +132,6 @@
             k.equipmentName,
             k.id,
             k.equipment_status,
-            k.equipment_status_remark,
             k.equipment_type,
             k.equipment_type_pictures
         ORDER BY
@@ -250,4 +246,8 @@
     </select>
 
 
+    <select id="getWorkLineLast" 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