From a9b68eaf46d73022d46d894bbdb8b099edd07d83 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 18 三月 2024 15:07:27 +0800
Subject: [PATCH] 部分页面添加设备种类和设备级别筛选条件
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml | 22 ++++++----------------
1 files changed, 6 insertions(+), 16 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 480d71e..9eec769 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
@@ -238,6 +238,12 @@
<if test="mdcEquipment.driveType != null and mdcEquipment.driveType != '' ">
AND t1.drive_type = #{mdcEquipment.driveType}
</if>
+ <if test="mdcEquipment.deviceLevel != null and mdcEquipment.deviceLevel != '' ">
+ AND t1.device_level = #{mdcEquipment.deviceLevel}
+ </if>
+ <if test="mdcEquipment.deviceCategory != null and mdcEquipment.deviceCategory != '' ">
+ AND t1.device_category = #{mdcEquipment.deviceCategory}
+ </if>
<if test="mdcEquipment.productionIds != null and mdcEquipment.productionIds.size() > 0 ">
AND t3.id IN
<foreach collection="mdcEquipment.productionIds" index="index" item="id" open="(" separator="," close=")">
@@ -284,22 +290,6 @@
<!--鏌ヨ鍗曡〃鏁版嵁-->
<select id="findWorkLineLast" resultType="org.jeecg.modules.mdc.dto.MdcEquipmentDto">
select top 1 spindlespeed, actualspindlespeed from [${tableName}] order by CollectTime desc
- </select>
-
- <!--鏌ヨ璁惧鏈�鏂颁竴鏉℃暟鎹�-->
- <select id="getEquipmentStatusList" resultType="org.jeecg.modules.mdc.entity.EquipmentLog">
- SELECT
- t1.*
- FROM
- EquipmentLog t1
- INNER JOIN ( SELECT MAX ( CollectTime ) AS CollectTime, EquipmentID FROM EquipmentLog GROUP BY EquipmentID ) t2 ON t1.CollectTime= t2.CollectTime
- AND t1.EquipmentID= t2.EquipmentID
- <if test="equipmentIdList != null and equipmentIdList.size() > 0">
- AND t1.EquipmentID IN
- <foreach collection="equipmentIdList" index="index" item="id" open="(" separator="," close=")">
- #{id}
- </foreach>
- </if>
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3