From 4b4d94f411eee4d459a6556e100710278c56a830 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 18 十月 2023 14:22:07 +0800
Subject: [PATCH] 三保验收单
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml
index 9e0e117..fc79d81 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml
@@ -18,7 +18,7 @@
LEFT JOIN mom_eam_maintenance_standard t2 ON t1.maintenance_standard_id = t2.id
LEFT JOIN mom_eam_maintenance_project t3 ON t1.maintenance_project_id = t3.id
LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_project_method' ) t4 ON t4.item_value = t3.maintenance_method
- where t1.del_flag = '0' and t2.del_flag = '0' and t3.del_flag = '0' and t2.type = "daily"
+ where t1.del_flag = '0' and t2.del_flag = '0' and t3.del_flag = '0' and t2.type = 'daily'
<if test="maintenanceStandardId != null and maintenanceStandardId != ''">
and t2.id = #{maintenanceStandardId}
</if>
@@ -42,22 +42,32 @@
<select id="getDailyMaintenanceOrderList" parameterType="Map" resultType="Map">
SELECT
t1.id,
- t1.`status`,
+ t1.status,
t5.item_text as statusName,
t1.num,
t4.id as maintenanceCycleId,
+ t4.maintenance_type as maintenanceType,
+ t10.item_text as maintenanceTypeName,
concat(t4.code, '/', t4.name) as maintenanceCycleName,
t3.id as equipmentId,
t3.num as equipmentNum,
t3.name as equipmentName,
t3.model as equipmentModel,
+ t3.specification,
+ t3.technology_status as technologyStatus,
+ t3.precision_parameters as precisionParameters,
+ t11.id as equipmentCategoryId,
+ t11.name as equipmentCategoryName,
t2.id as maintenanceStandardId,
- t2.`num` as maintenanceStandardNum,
+ t2.num as maintenanceStandardNum,
t2.assign_mode assignMode,
t3.team_id teamId,
t3.use_id as useId,
t6.depart_name as departName,
t7.name as teamName,
+ DATEADD(DAY,-30,t1.plan_start_time) as yellowWarningTime,
+ DATEADD(DAY,-7,t1.plan_start_time) as redWarningTime,
+ CONVERT(varchar(100), GETDATE(), 20) AS currentDateTime,
t1.plan_start_time as planStartTime,
t1.plan_end_time as planEndTime,
t1.actual_start_time as actualStartTime,
@@ -66,18 +76,25 @@
t9.item_text as assignModeName,
t1.create_by as createBy,
t1.create_time as createTime,
- t1.remark
+ t1.remark,
+ t1.description,
+ t1.precision_inspection_status as precisionInspectionStatus,
+ t1.stove_exempt_status as stoveExemptStatus,
+ t1.inspect_user as inspectUser,
+ t1.inspect_date as inspectDate
FROM
mom_eam_daily_maintenance_order t1
LEFT JOIN mom_eam_maintenance_standard t2 ON t1.maintenance_standard_id = t2.id
left join mom_eam_equipment t3 on t1.equipment_id = t3.id
+ left join mom_eam_equipment_category t11 on t3.equipment_category_id = t11.id
left join mom_eam_maintenance_cycle t4 on t1.maintenance_cycle_id = t4.id
- LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'daily_maintenance_order_status' ) t5 on t5.item_value = t1.`status`
+ LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'daily_maintenance_order_status' ) t5 on t5.item_value = t1.status
left join sys_depart t6 on t3.use_id = t6.id
left join mom_base_team t7 on t7.id = t3.team_id
left join sys_user t8 on t1.maintenance_user_id = t8.id
left join ( SELECT * FROM v_sys_dict WHERE dict_code = 'assign_mode' ) t9 on t9.item_value = t2.assign_mode
- WHERE t1.del_flag = 0 and t2.del_flag = 0 and t3.del_flag = 0 and t4.del_flag = 0
+ left join (SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_type') t10 on t10.item_value = t4.maintenance_type
+ WHERE t1.del_flag = 0 and t2.del_flag = 0 and t3.del_flag = 0 and t4.del_flag = 0 and t4.maintenance_type =#{params.maintenanceType}
<if test="params.num != null and params.num != ''">
and t1.num like concat('%',#{params.num},'%')
</if>
@@ -103,7 +120,7 @@
LEFT JOIN mom_eam_maintenance_standard t2 ON tt.maintenance_standard_id = t2.id
LEFT JOIN mom_eam_maintenance_project t3 ON tt.maintenance_project_id = t3.id
LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_project_method' ) t4 ON t4.item_value = t3.maintenance_method
- WHERE t1.del_flag = '0' AND t2.del_flag = '0' AND t3.del_flag = '0' AND t2.type = "daily"
+ WHERE t1.del_flag = '0' AND t2.del_flag = '0' AND t3.del_flag = '0' AND t2.type = 'daily'
<if test="dailyMaintenanceOrderId != null and dailyMaintenanceOrderId != ''">
and tt.daily_maintenance_order_id = #{dailyMaintenanceOrderId}
</if>
--
Gitblit v1.9.3