From 3dfc79a424b662fdb1f649b728aa811d70204c9b Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期一, 21 八月 2023 10:27:13 +0800 Subject: [PATCH] 点检 保养 调整 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml | 10 +++++----- 1 files changed, 5 insertions(+), 5 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..a894487 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,7 +42,7 @@ <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, @@ -52,7 +52,7 @@ t3.name as equipmentName, t3.model as equipmentModel, 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, @@ -72,7 +72,7 @@ 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_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 @@ -103,7 +103,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