From 848e5624f3a814763e81db5d79d8f0761c5bb4f1 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 01 二月 2024 10:25:40 +0800
Subject: [PATCH] 设备管理按照车间筛选和导出
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml | 50 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 43 insertions(+), 7 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..1d402c2 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
@@ -242,12 +238,52 @@
<if test="mdcEquipment.driveType != null and mdcEquipment.driveType != '' ">
AND t1.drive_type = #{mdcEquipment.driveType}
</if>
- <if test="mdcEquipment.productionName != null and mdcEquipment.productionName != '' ">
- AND t3.production_name LIKE CONCAT(CONCAT('%',#{mdcEquipment.productionName}),'%')
+ <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=")">
+ #{id}
+ </foreach>
</if>
</where>
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.*
+ FROM
+ mdc_equipment t1
+ LEFT JOIN mdc_production_equipment t2 ON t1.id = t2.equipment_id
+ LEFT JOIN mdc_production t3 ON t2.production_id = t3.id
+ <where>
+ <if test="mdcEquipment.equipmentId != null and mdcEquipment.equipmentId != '' ">
+ AND t1.equipment_id LIKE CONCAT(CONCAT('%',#{mdcEquipment.equipmentId}),'%')
+ </if>
+ <if test="mdcEquipment.equipmentName != null and mdcEquipment.equipmentName != '' ">
+ AND t1.equipment_name LIKE CONCAT(CONCAT('%',#{mdcEquipment.equipmentName}),'%')
+ </if>
+ <if test="mdcEquipment.equipmentModel != null and mdcEquipment.equipmentModel != '' ">
+ AND t1.equipment_name = #{mdcEquipment.equipmentModel}
+ </if>
+ <if test="mdcEquipment.equipmentType != null and mdcEquipment.equipmentType != '' ">
+ AND t1.equipmentType = #{mdcEquipment.equipmentType}
+ </if>
+ <if test="mdcEquipment.driveType != null and mdcEquipment.driveType != '' ">
+ AND t1.drive_type = #{mdcEquipment.driveType}
+ </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=")">
+ #{id}
+ </foreach>
+ </if>
+ </where>
+ order by t1.sort_no
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3