From 8e354b102ac13b47570fbc10a3a0f06a39024995 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期五, 15 三月 2024 09:41:27 +0800
Subject: [PATCH] update
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml | 7 +++++++
1 files changed, 7 insertions(+), 0 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 796eb9e..5955ab9 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
@@ -254,6 +254,7 @@
t1.id showId,
t1.is_line_equip isLineEquip,
t1.is_judging isJudging,
+ t1.area_id areaId,
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
@@ -273,6 +274,10 @@
</if>
<if test="workCenterId != null and workCenterId != ''">
and t1.work_center_id = #{workCenterId}
+ </if>
+-- 鏍规嵁areaId鏌ヨ璁惧
+ <if test="areaId != null and areaId != ''">
+ and t1.area_id = #{areaId}
</if>
<if test="factoryModelId != null and factoryModelId != ''">
and t1.factory_model_id = #{factoryModelId}
@@ -325,6 +330,7 @@
select t9.* from ( select
t1.id id,
t5.name projectName,
+ '' as maintenanceRole,
t5.detection_standard standard,
'1' as type,
t6.name cycleName,
@@ -341,6 +347,7 @@
select
t3.id id,
t7.name projectName,
+ t3.maintenance_role maintenanceRole,
t7.standard standard,
t8.maintenance_type type,
t8.name cycleName,
--
Gitblit v1.9.3