From dd28194577a2bfaf16b72137f5dbb3021b72b3fd Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期三, 22 十一月 2023 15:23:25 +0800 Subject: [PATCH] 三保未执行消息提醒 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml | 13 ++++++++----- 1 files changed, 8 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 3e44ae1..35e4aad 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 @@ -31,8 +31,8 @@ <select id="getMaintenanceCycleByStandardId" parameterType="Map" resultType="org.jeecg.modules.eam.model.MaintenanceCycleVo"> SELECT DISTINCT t2.id AS value, - concat( t2.CODE, '/', t2.name ) AS text, - concat( t2.CODE, '/', t2.name ) AS title + t2.name AS text, + t2.name AS title FROM mom_eam_maintenance_standard_detail t1 LEFT JOIN mom_eam_maintenance_cycle t2 ON t1.maintenance_cycle_id = t2.id @@ -50,7 +50,7 @@ t4.maintenance_type as maintenanceType, t10.item_text as maintenanceTypeName, t4.cycle as maintenanceCycle, - concat(t4.code, '/', t4.name) as maintenanceCycleName, + t4.name as maintenanceCycleName, t3.id as equipmentId, t3.num as equipmentNum, t3.name as equipmentName, @@ -80,10 +80,12 @@ t1.create_time as createTime, t1.remark, t1.description, + t1.confirm_status as confirmStatus, t1.precision_inspection_status as precisionInspectionStatus, t1.maintenance_order_uda3 as receipts, t12.num as receiptsNum, - t13.item_text as receiptsName + t13.item_text as receiptsName, + t14.item_text as confirmStatusName FROM mom_eam_daily_maintenance_order t1 LEFT JOIN mom_eam_maintenance_standard t2 ON t1.maintenance_standard_id = t2.id @@ -98,6 +100,7 @@ left join (SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_type') t10 on t10.item_value = t4.maintenance_type left join sys_file_name t12 on t1.maintenance_order_uda3 = t12.id left join (SELECT * FROM v_sys_dict WHERE dict_code = 'sys_file_name') t13 on t13.item_value = t12.name + left join (SELECT * FROM v_sys_dict WHERE dict_code = 'two_maintenance_devolution_status') t14 on t14.item_value = t1.confirm_status 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},'%') @@ -116,7 +119,7 @@ t4.maintenance_type as maintenanceType, t10.item_text as maintenanceTypeName, t4.cycle as maintenanceCycle, - concat(t4.code, '/', t4.name) as maintenanceCycleName, + t4.name as maintenanceCycleName, t3.id as equipmentId, t3.num as equipmentNum, t3.name as equipmentName, -- Gitblit v1.9.3