From 8c2a5e73b08cddfee3fac4b6e9bf7c70245bcba7 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 08 十一月 2023 14:15:21 +0800
Subject: [PATCH] 设备台账导入优化
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml | 43 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 41 insertions(+), 2 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 cbe4593..42a6cb7 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
@@ -244,7 +244,11 @@
t1.work_center_id workCenterId,
t1.warranty_start warrantyStart,
t1.warranty_end warrantyEnd,
- t1.property_status propertyStatus
+ t1.property_status propertyStatus,
+ t1.check_period checkPeriod,
+ t1.next_technology_status_qualification_time nextTechnologyStatusQualificationTime,
+ t1.technology_status_qualification_time technologyStatusQualificationTime,
+ t1.technology_status_verification_type technologyStatusVerificationType
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
where t1.del_flag = 0
@@ -252,7 +256,7 @@
and t1.num like concat('%',#{num},'%')
</if>
<if test="name != null and name != ''">
- and t1.num like concat('%',#{name},'%')
+ and t1.name like concat('%',#{name},'%')
</if>
<if test="model != null and model != ''">
and t1.model like concat('%',#{model},'%')
@@ -292,5 +296,40 @@
</if>
order by t1.create_time desc
</select>
+ <select id="getStandardList" resultType="org.jeecg.modules.eam.entity.DailyInspectionStandardDetail">
+ select t9.* from ( select
+ t1.id id,
+ t5.name projectName,
+ t5.detection_standard standard,
+ '1' as type,
+ t6.name cycleName,
+ t2.equipment_id equipmentId
+ from mom_eam_daily_inspection_standard_detail t1
+ left join mom_eam_daily_inspection_standard t2
+ on t2.id = t1.daily_inspection_standard_id
+ left join mom_eam_inspection_project t5
+ on t5.id = t1.inspection_project_id
+ left join mom_eam_maintenance_cycle t6
+ on t6.id = t1.inspection_cycle_id
+ where t2.version_status = '2'
+ union all
+ select
+ t3.id id,
+ t7.name projectName,
+ t7.standard standard,
+ t8.maintenance_type type,
+ t8.name cycleName,
+ t4.equipment_id equipmentId
+ from mom_eam_maintenance_standard_detail t3
+ left join mom_eam_maintenance_standard t4
+ on t4.id = t3.maintenance_standard_id
+ left join mom_eam_maintenance_project t7
+ on t7.id = t3.maintenance_project_id
+ left join mom_eam_maintenance_cycle t8
+ on t8.id = t3.maintenance_cycle_id
+ where t4.version_status = '2') t9 where
+ t9.equipmentId = #{mainId}
+ order by t9.type
+ </select>
</mapper>
--
Gitblit v1.9.3