From ce8cb72035593058a572b905bedd327cad579f18 Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期四, 19 六月 2025 13:58:17 +0800
Subject: [PATCH] Revert "首页本月三保、下月三保、下下月三保统计调整"
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/CalibrationOrderMapper.xml | 52 ++++++++++++++--------------------------------------
1 files changed, 14 insertions(+), 38 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/CalibrationOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/CalibrationOrderMapper.xml
index d626d77..fe785c8 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/CalibrationOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/CalibrationOrderMapper.xml
@@ -58,24 +58,20 @@
</select>
<select id="getFactoryThisMonthMaintenanceList" parameterType="String" resultType="Map">
- -- select count(0) as totalCount from mom_eam_equipment t1 where t1.del_flag = '0' and SUBSTRING(CONVERT(VARCHAR(10), t1.next_third_maintenance_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 7)
- select count(0) as totalCount from mom_eam_equipment t1 where t1.del_flag = '0' and SUBSTRING(CONVERT(VARCHAR(10), t1.third_maintenance_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 7)
+ select count(0) as totalCount from mom_eam_equipment t1 where t1.del_flag = '0' and SUBSTRING(CONVERT(VARCHAR(10), t1.next_third_maintenance_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 7)
</select>
<select id="getFactoryNextMonthMaintenanceList" parameterType="String" resultType="Map">
- -- select count(0) as totalCount from mom_eam_equipment t1 where t1.del_flag = '0' and SUBSTRING(CONVERT(VARCHAR(10), t1.next_third_maintenance_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), DATEADD(MONTH, 1, GETDATE()), 120), 1, 7)
- select count(0) as totalCount from mom_eam_equipment t1 where t1.del_flag = '0' and SUBSTRING(CONVERT(VARCHAR(10), t1.third_maintenance_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), DATEADD(MONTH, 1, GETDATE()), 120), 1, 7)
+ select count(0) as totalCount from mom_eam_equipment t1 where t1.del_flag = '0' and SUBSTRING(CONVERT(VARCHAR(10), t1.next_third_maintenance_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), DATEADD(MONTH, 1, GETDATE()), 120), 1, 7)
</select>
<select id="getFactoryNextNextMonthMaintenanceList" parameterType="String" resultType="Map">
- -- select count(0) as totalCount from mom_eam_equipment t1 where t1.del_flag = '0' and SUBSTRING(CONVERT(VARCHAR(10), t1.next_third_maintenance_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), DATEADD(MONTH,2 , GETDATE()), 120), 1, 7)
- select count(0) as totalCount from mom_eam_equipment t1 where t1.del_flag = '0' and SUBSTRING(CONVERT(VARCHAR(10), t1.third_maintenance_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), DATEADD(MONTH,2 , GETDATE()), 120), 1, 7)
+ select count(0) as totalCount from mom_eam_equipment t1 where t1.del_flag = '0' and SUBSTRING(CONVERT(VARCHAR(10), t1.next_third_maintenance_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), DATEADD(MONTH,2 , GETDATE()), 120), 1, 7)
</select>
<select id="getFactoryThisMonthMaintenanceFinishList" parameterType="String" resultType="Map">
- -- select count(0) as totalCount from mom_eam_daily_maintenance_order t1 left join mom_eam_equipment t2 on t1.equipment_id = t2.id left join mom_eam_maintenance_cycle t4 on t1.maintenance_cycle_id = t4.id
- -- where t1.del_flag = '0' and t1.status = '5' and t4.maintenance_type = '3' and SUBSTRING(CONVERT(VARCHAR(10), t1.actual_end_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 7)
- select COUNT(0) as totalCount from mom_eam_equipment t1 where t1.del_flag = '0' and SUBSTRING(CONVERT(VARCHAR(10), t1.third_maintenance_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 7) and T1.next_third_maintenance_time IS NOT NULL;
+ select count(0) as totalCount from mom_eam_daily_maintenance_order t1 left join mom_eam_equipment t2 on t1.equipment_id = t2.id left join mom_eam_maintenance_cycle t4 on t1.maintenance_cycle_id = t4.id
+ where t1.del_flag = '0' and t1.status = '5' and t4.maintenance_type = '3' and SUBSTRING(CONVERT(VARCHAR(10), t1.actual_end_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 7)
</select>
<select id="getEquipmentTechnologyStatusList" parameterType="String" resultType="Map">
@@ -167,8 +163,7 @@
left join mom_base_area t2 on t1.work_center_id = t2.id
left join mom_base_area t3 on t1.area_id = t3.id
left join (SELECT * FROM v_sys_dict WHERE dict_code = 'technology_status') t4 ON t4.item_value = t1.technology_status
- -- WHERE t1.del_flag = '0' and SUBSTRING(CONVERT(VARCHAR(10), t1.next_third_maintenance_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 7)
- WHERE t1.del_flag = '0' and SUBSTRING(CONVERT(VARCHAR(10), t1.third_maintenance_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 7)
+ WHERE t1.del_flag = '0' and SUBSTRING(CONVERT(VARCHAR(10), t1.next_third_maintenance_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), GETDATE(), 120), 1, 7)
<if test="workCenterId != null and workCenterId != ''">
and t1.work_center_id = #{workCenterId}
</if>
@@ -196,8 +191,7 @@
left join mom_base_area t2 on t1.work_center_id = t2.id
left join mom_base_area t3 on t1.area_id = t3.id
left join (SELECT * FROM v_sys_dict WHERE dict_code = 'technology_status') t4 ON t4.item_value = t1.technology_status
- -- WHERE t1.del_flag = '0' and SUBSTRING(CONVERT(VARCHAR(10), t1.next_third_maintenance_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), DATEADD(MONTH, 1, GETDATE()), 120), 1, 7)
- WHERE t1.del_flag = '0' and SUBSTRING(CONVERT(VARCHAR(10), t1.third_maintenance_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), DATEADD(MONTH, 1, GETDATE()), 120), 1, 7)
+ WHERE t1.del_flag = '0' and SUBSTRING(CONVERT(VARCHAR(10), t1.next_third_maintenance_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), DATEADD(MONTH, 1, GETDATE()), 120), 1, 7)
<if test="workCenterId != null and workCenterId != ''">
and t1.work_center_id = #{workCenterId}
</if>
@@ -225,8 +219,7 @@
left join mom_base_area t2 on t1.work_center_id = t2.id
left join mom_base_area t3 on t1.area_id = t3.id
left join (SELECT * FROM v_sys_dict WHERE dict_code = 'technology_status') t4 ON t4.item_value = t1.technology_status
- -- WHERE t1.del_flag = '0' and SUBSTRING(CONVERT(VARCHAR(10), t1.next_third_maintenance_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), DATEADD(MONTH,2 , GETDATE()), 120), 1, 7)
- WHERE t1.del_flag = '0' and SUBSTRING(CONVERT(VARCHAR(10), t1.third_maintenance_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), DATEADD(MONTH,2 , GETDATE()), 120), 1, 7)
+ WHERE t1.del_flag = '0' and SUBSTRING(CONVERT(VARCHAR(10), t1.next_third_maintenance_time, 120), 1, 7) = SUBSTRING(CONVERT(VARCHAR(10), DATEADD(MONTH,2 , GETDATE()), 120), 1, 7)
<if test="workCenterId != null and workCenterId != ''">
and t1.work_center_id = #{workCenterId}
</if>
@@ -244,26 +237,8 @@
</select>
<select id="showThisMonthMaintenanceFinishList" parameterType="Map" resultType="Map">
--- SELECT
--- t1.id,
--- t20.name AS factoryName,
--- t30.name AS productName,
--- t2.num AS equipmentNum,
--- t2.name AS equipmentName,
--- t2.model AS equipmentModel,
--- t2.specification,
--- t40.item_text AS technologyStatus
--- FROM
--- mom_eam_daily_maintenance_order t1
--- LEFT JOIN mom_eam_equipment t2 ON t1.equipment_id = t2.id
--- LEFT JOIN mom_eam_maintenance_cycle t4 ON t1.maintenance_cycle_id = t4.id
--- LEFT JOIN mom_base_area t20 ON t2.work_center_id = t20.id
--- LEFT JOIN mom_base_area t30 ON t2.area_id = t30.id
--- LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'technology_status' ) t40 ON t40.item_value = t2.technology_status
- -- WHERE t1.del_flag = '0' AND t1.status = '5' AND t4.maintenance_type = '3'
- -- AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t1.actual_end_time, 120 ), 1, 7 ) = SUBSTRING ( CONVERT ( VARCHAR ( 10 ), GETDATE( ), 120 ), 1, 7 )
SELECT
- t2.id,
+ t1.id,
t20.name AS factoryName,
t30.name AS productName,
t2.num AS equipmentNum,
@@ -272,13 +247,14 @@
t2.specification,
t40.item_text AS technologyStatus
FROM
- mom_eam_equipment t2
- LEFT JOIN mom_eam_maintenance_cycle t4 ON t2.id = t4.id
+ mom_eam_daily_maintenance_order t1
+ LEFT JOIN mom_eam_equipment t2 ON t1.equipment_id = t2.id
+ LEFT JOIN mom_eam_maintenance_cycle t4 ON t1.maintenance_cycle_id = t4.id
LEFT JOIN mom_base_area t20 ON t2.work_center_id = t20.id
LEFT JOIN mom_base_area t30 ON t2.area_id = t30.id
LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'technology_status' ) t40 ON t40.item_value = t2.technology_status
- WHERE t2.del_flag = '0' and t2.next_third_maintenance_time IS NOT NULL
- AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t2.third_maintenance_time, 120 ), 1, 7 ) = SUBSTRING ( CONVERT ( VARCHAR ( 10 ), GETDATE( ), 120 ), 1, 7 )
+ WHERE t1.del_flag = '0' AND t1.status = '5' AND t4.maintenance_type = '3'
+ AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t1.actual_end_time, 120 ), 1, 7 ) = SUBSTRING ( CONVERT ( VARCHAR ( 10 ), GETDATE( ), 120 ), 1, 7 )
<if test="workCenterId != null and workCenterId != ''">
and t2.work_center_id = #{workCenterId}
</if>
--
Gitblit v1.9.3