From 5c3742eca3b35c96f66c53b8dfabcb6848e03a7d Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 13 十二月 2023 16:46:19 +0800
Subject: [PATCH] 修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml | 10 +++++++++-
1 files changed, 9 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 995a2eb..7026233 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,6 +289,12 @@
<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>
--
Gitblit v1.9.3