From 411d79af7b1b755535fa9a9ee6ed94f682fca09a Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期四, 21 十二月 2023 17:19:18 +0800
Subject: [PATCH] 保养标准导入
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
index 7809e61..c91e888 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
@@ -234,7 +234,7 @@
t1.port port,
t1.coordinate_num coordinateNum,
t1.project_approval_no projectApprovalNo,
- t1.standard_a tandardA,
+ t1.standard_a standardA,
t1.standard_b standardB,
t1.standard_c standardC,
t1.standard_d standardD,
@@ -252,6 +252,8 @@
t1.line_id lineId,
t1.is_meta isMeta,
t1.id showId,
+ t1.is_line_equip isLineEquip,
+ t1.is_judging isJudging,
t3.sumOfEquipment
from mom_eam_equipment t1
left join (select * from mom_eam_equipment_category where del_flag = 0) t2 on t1.equipment_category_id = t2.id
@@ -287,8 +289,20 @@
<if test="equipmentStatus != null and equipmentStatus != ''">
and t1.equipment_status = #{equipmentStatus}
</if>
+ <if test="isLineEquip != null and isLineEquip != ''">
+ and t1.is_line_equip = #{isLineEquip}
+ </if>
+ <if test="isLine != null and isLine != ''">
+ and t1.is_line = #{isLine}
+ </if>
<if test="specificEquipment != null and specificEquipment != ''">
and t1.specific_equipment = #{specificEquipment}
+ </if>
+ <if test="equipNums.size!=0">
+ and t1.num in
+ <foreach collection="equipNums" open="(" separator="," close=")" item="num">
+ #{num}
+ </foreach>
</if>
<if test="warrantyStart != null">
and DATEDIFF(day,t1.warranty_start,#{warrantyStart})=0
@@ -337,6 +351,7 @@
on t8.id = t3.maintenance_cycle_id
where t4.version_status = '2') t9 where
t9.equipmentId = #{mainId}
+ and t9.type = #{type}
order by t9.type
</select>
--
Gitblit v1.9.3