From 29d74c2b0706143e550524153857737975eb88a0 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 01 九月 2023 20:28:23 +0800
Subject: [PATCH] 审批完成
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml | 130 ++++++++++++++++++++++---------------------
1 files changed, 67 insertions(+), 63 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 75c128d..6b7de40 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
@@ -3,42 +3,44 @@
<mapper namespace="org.jeecg.modules.eam.mapper.EamEquipmentMapper">
<select id="getResumeUseRecordList" parameterType="Map" resultType="Map">
- SELECT DISTINCT
- t1.id,
- t1.num,
- '璁惧璋冨叆' AS 'type',
- t1.create_time AS createTime,
- t1.create_by AS createBy
- FROM
- mom_eam_equipment_transfer t1
- left join mom_eam_equipment_transfer_in_detail t2 on t1.id = t2.equipment_transfer_id
- where t1.del_flag = '0' and t2.del_flag = '0' and t2.equipment_id = #{params.equipmentId}
+ select * from (
+ SELECT DISTINCT
+ t1.id,
+ t1.num,
+ '璁惧璋冨叆' AS 'type',
+ t1.create_time AS createTime,
+ t1.create_by AS createBy
+ FROM
+ mom_eam_equipment_transfer t1
+ left join mom_eam_equipment_transfer_in_detail t2 on t1.id = t2.equipment_transfer_id
+ where t1.del_flag = '0' and t2.del_flag = '0' and t2.equipment_id = #{params.equipmentId}
- UNION
+ UNION
- SELECT DISTINCT
- t1.id,
- t1.num,
- '璁惧璋冨嚭' AS 'type',
- t1.create_time AS createTime,
- t1.create_by AS createBy
- FROM
- mom_eam_equipment_transfer t1
- left join mom_eam_equipment_transfer_out_detail t2 on t1.id = t2.equipment_transfer_id
- where t1.del_flag = '0' and t2.del_flag = '0' and t2.equipment_id = #{params.equipmentId}
+ SELECT DISTINCT
+ t1.id,
+ t1.num,
+ '璁惧璋冨嚭' AS 'type',
+ t1.create_time AS createTime,
+ t1.create_by AS createBy
+ FROM
+ mom_eam_equipment_transfer t1
+ left join mom_eam_equipment_transfer_out_detail t2 on t1.id = t2.equipment_transfer_id
+ where t1.del_flag = '0' and t2.del_flag = '0' and t2.equipment_id = #{params.equipmentId}
- UNION
+ UNION
- SELECT DISTINCT
- t1.id,
- t1.num,
- '璁惧鍙樺姩' AS 'type',
- t1.create_time AS createTime,
- t1.create_by AS createBy
- FROM
- mom_eam_equipment_change t1
- left join mom_eam_equipment_change_detail t2 on t1.id = t2.equipment_change_id
- where t1.del_flag = '0' and t2.del_flag = '0' and t2.equipment_id = #{params.equipmentId}
+ SELECT DISTINCT
+ t1.id,
+ t1.num,
+ '璁惧鍙樺姩' AS 'type',
+ t1.create_time AS createTime,
+ t1.create_by AS createBy
+ FROM
+ mom_eam_equipment_change t1
+ left join mom_eam_equipment_change_detail t2 on t1.id = t2.equipment_change_id
+ where t1.del_flag = '0' and t2.del_flag = '0' and t2.equipment_id = #{params.equipmentId}
+ ) as equipmentChange
</select>
<select id="getResumeInspectionRecordList" parameterType="Map" resultType="Map">
@@ -61,39 +63,41 @@
</select>
<select id="getResumeMaintenanceRecordList" parameterType="Map" resultType="Map">
- SELECT DISTINCT
- t1.id,
- '鏃ュ父淇濆吇' as maintenanceType,
- t1.num,
- t4.name as teamName,
- t5.realname as maintenanceuserName,
- t1.actual_start_time as actualStartTime,
- t1.actual_end_time as actualEndTime
- FROM
- mom_eam_daily_maintenance_order t1
- LEFT JOIN mom_eam_daily_maintenance_order_detail t2 ON t1.id = t2.daily_maintenance_order_id
- left join mom_eam_equipment t3 on t1.equipment_id = t3.id
- left join mom_base_team t4 on t3.team_id = t4.id
- left join sys_user t5 on t5.id= t1.maintenance_user_id
- WHERE t1.del_flag = '0' and t2.del_flag= '0' and t3.del_flag= '0' and t1.equipment_id = #{params.equipmentId}
+ select * from (
+ SELECT DISTINCT
+ t1.id,
+ '鏃ュ父淇濆吇' as maintenanceType,
+ t1.num,
+ t4.name as teamName,
+ t5.realname as maintenanceuserName,
+ t1.actual_start_time as actualStartTime,
+ t1.actual_end_time as actualEndTime
+ FROM
+ mom_eam_daily_maintenance_order t1
+ LEFT JOIN mom_eam_daily_maintenance_order_detail t2 ON t1.id = t2.daily_maintenance_order_id
+ left join mom_eam_equipment t3 on t1.equipment_id = t3.id
+ left join mom_base_team t4 on t3.team_id = t4.id
+ left join sys_user t5 on t5.id= t1.maintenance_user_id
+ WHERE t1.del_flag = '0' and t2.del_flag= '0' and t3.del_flag= '0' and t1.equipment_id = #{params.equipmentId}
- UNION
+ UNION
- SELECT DISTINCT
- t1.id,
- '涓撲笟淇濆吇' AS maintenanceType,
- t1.num,
- t4.name as teamName,
- t5.realname as maintenanceuserName,
- t1.actual_start_time as actualStartTime,
- t1.actual_end_time as actualEndTime
- FROM
- mom_eam_specialty_maintenance_order t1
- left join mom_eam_specialty_maintenance_order_detail t2 on t1.id = t2.specialty_maintenance_order_id
- left join mom_eam_equipment t3 on t2.equipment_id = t3.id
- left join mom_base_team t4 on t3.team_id = t4.id
- left join sys_user t5 on t5.id= t1.maintenance_user_id
- WHERE t1.del_flag = '0' and t2.del_flag= '0' and t3.del_flag= '0' and t2.equipment_id = #{params.equipmentId}
+ SELECT DISTINCT
+ t1.id,
+ '涓撲笟淇濆吇' AS maintenanceType,
+ t1.num,
+ t4.name as teamName,
+ t5.realname as maintenanceuserName,
+ t1.actual_start_time as actualStartTime,
+ t1.actual_end_time as actualEndTime
+ FROM
+ mom_eam_specialty_maintenance_order t1
+ left join mom_eam_specialty_maintenance_order_detail t2 on t1.id = t2.specialty_maintenance_order_id
+ left join mom_eam_equipment t3 on t2.equipment_id = t3.id
+ left join mom_base_team t4 on t3.team_id = t4.id
+ left join sys_user t5 on t5.id= t1.maintenance_user_id
+ WHERE t1.del_flag = '0' and t2.del_flag= '0' and t3.del_flag= '0' and t2.equipment_id = #{params.equipmentId}
+ ) as maintenance
</select>
<select id="getResumeRepairRecordList" parameterType="Map" resultType="Map">
--
Gitblit v1.9.3